From: Ville Syrjala Subject: [PATCH 08/10] drm/i915: Centralize the SKL DDI A/E vs. B/C/D buf trans handling Date: Mon, 16 Oct 2017 17:57:03 +0300 Message-ID: <20171016145705.11780-9-ville.syrjala@linux.intel.com> References: <20171016145705.11780-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2167A6E415 for ; Mon, 16 Oct 2017 14:57:38 +0000 (UTC) In-Reply-To: <20171016145705.11780-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNL TCBEREkgQi9DL0Qgb25seSBoYXZlIDkgdXNhYmxlIGJ1ZiB0cmFucyByZWdpc3RlcnMgZm9yIERQ L2VEUC4gVGhhdAptYXRjaGVzIHRoZSBub3JtYWwgRFAgYnVmIHRyYW5zIHRhYmxlcywgYnV0IHRo ZSBsb3cgdnN3aW5nIGVEUCB0YWJsZXMKaGF2ZSAxMCBlbnRyaWVzLiBUaHVzIHRoZSBlRFAgdGFi bGVzIGNhbiBvbmx5IGJlIHVzZWQgc2FmZWx5IHdpdGggRERJIEEKYW5kIEUuCgpXZSB0cnkgdG8g Y2F0Y2ggY2FzZXMgd2hlcmUgRERJIEIvQy9EIGdldHMgdXNlZCB3aXRoIHRoZSB3cm9uZyBudW1i ZXIgb2YKZW50aXJlcyBpbiBzb21lIHBhcnRzIG9mIHRoZSBjb2RlLCBidXQgbm90IGV2ZXJ5d2hl cmUuIExldCdzIG1vdmUgdGhlCmNvZGUgdG8gZGVhbCB3aXRoIHRoYXQgZGVlcGVyIGludG8gaW50 ZWxfZGRpX2dldF9idWZfdHJhbnNfZWRwKCkuIEFuZApmb3Igc2FrZSBvZiBzeW1tZXRyeSBkbyB0 aGUgc2FtZSBpbiBpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19kcCgpLiBUaGF0CndvdWxkIGFsc28g YXZvaWQgZXhwbG9zaW9ucyBpbiB0aGUgcmF0aGVyIHVubGlrZWx5IGNhc2UgdGhhdCB0aGUgRFAK dGFibGVzIHdvdWxkIGdldCByZXZpc2VkIHRvIDEwIGVudHJpZXMgYXMgd2VsbC4KClNpZ25lZC1v ZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgfCA2MCArKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygr KSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCAzYmNlNmJk ZGVhYTkuLmYwYTcwOWI2NmUwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTU4Nywx NCArNTg3LDI5IEBAIHNrbF9nZXRfYnVmX3RyYW5zX2hkbWkoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCBpbnQgKm5fZW50cmllcykKIAl9CiB9CiAKK3N0YXRpYyBpbnQgc2tsX2J1 Zl90cmFuc19udW1fZW50cmllcyhlbnVtIHBvcnQgcG9ydCwgaW50IG5fZW50cmllcykKK3sKKwkv KiBPbmx5IERESUEgYW5kIERESUUgY2FuIHNlbGVjdCB0aGUgMTB0aCByZWdpc3RlciB3aXRoIERQ ICovCisJaWYgKHBvcnQgPT0gUE9SVF9BIHx8IHBvcnQgPT0gUE9SVF9FKQorCQlyZXR1cm4gbWlu KG5fZW50cmllcywgMTApOworCWVsc2UKKwkJcmV0dXJuIG1pbihuX2VudHJpZXMsIDkpOworfQor CiBzdGF0aWMgY29uc3Qgc3RydWN0IGRkaV9idWZfdHJhbnMgKgogaW50ZWxfZGRpX2dldF9idWZf dHJhbnNfZHAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICAgaW50ICpu X2VudHJpZXMpCisJCQkgICBlbnVtIHBvcnQgcG9ydCwgaW50ICpuX2VudHJpZXMpCiB7CiAJaWYg KElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19DT0ZGRUVMQUtFKGRldl9wcml2KSkgewotCQly ZXR1cm4ga2JsX2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsIG5fZW50cmllcyk7CisJCWNvbnN0 IHN0cnVjdCBkZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25zID0KKwkJCWtibF9nZXRfYnVm X3RyYW5zX2RwKGRldl9wcml2LCBuX2VudHJpZXMpOworCQkqbl9lbnRyaWVzID0gc2tsX2J1Zl90 cmFuc19udW1fZW50cmllcyhwb3J0LCAqbl9lbnRyaWVzKTsKKwkJcmV0dXJuIGRkaV90cmFuc2xh dGlvbnM7CiAJfSBlbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSkgewotCQlyZXR1cm4gc2ts X2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsIG5fZW50cmllcyk7CisJCWNvbnN0IHN0cnVjdCBk ZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25zID0KKwkJCXNrbF9nZXRfYnVmX3RyYW5zX2Rw KGRldl9wcml2LCBuX2VudHJpZXMpOworCQkqbl9lbnRyaWVzID0gc2tsX2J1Zl90cmFuc19udW1f ZW50cmllcyhwb3J0LCAqbl9lbnRyaWVzKTsKKwkJcmV0dXJuIGRkaV90cmFuc2xhdGlvbnM7CiAJ fSBlbHNlIGlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCSpuX2VudHJpZXMgPSBBUlJB WV9TSVpFKGJkd19kZGlfdHJhbnNsYXRpb25zX2RwKTsKIAkJcmV0dXJuICBiZHdfZGRpX3RyYW5z bGF0aW9uc19kcDsKQEAgLTYwOSwxMCArNjI0LDEzIEBAIGludGVsX2RkaV9nZXRfYnVmX3RyYW5z X2RwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogc3RhdGljIGNvbnN0IHN0 cnVjdCBkZGlfYnVmX3RyYW5zICoKIGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2VkcChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgaW50ICpuX2VudHJpZXMpCisJCQkg ICAgZW51bSBwb3J0IHBvcnQsIGludCAqbl9lbnRyaWVzKQogewogCWlmIChJU19HRU45X0JDKGRl dl9wcml2KSkgewotCQlyZXR1cm4gc2tsX2dldF9idWZfdHJhbnNfZWRwKGRldl9wcml2LCBuX2Vu dHJpZXMpOworCQljb25zdCBzdHJ1Y3QgZGRpX2J1Zl90cmFucyAqZGRpX3RyYW5zbGF0aW9ucyA9 CisJCQlza2xfZ2V0X2J1Zl90cmFuc19lZHAoZGV2X3ByaXYsIG5fZW50cmllcyk7CisJCSpuX2Vu dHJpZXMgPSBza2xfYnVmX3RyYW5zX251bV9lbnRyaWVzKHBvcnQsICpuX2VudHJpZXMpOworCQly ZXR1cm4gZGRpX3RyYW5zbGF0aW9uczsKIAl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJp dikpIHsKIAkJcmV0dXJuIGJkd19nZXRfYnVmX3RyYW5zX2VkcChkZXZfcHJpdiwgbl9lbnRyaWVz KTsKIAl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CkBAIC04MDEsMTEgKzgxOSwx MSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmVwYXJlX2RwX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyKQogCiAJc3dpdGNoIChlbmNvZGVyLT50eXBlKSB7CiAJY2FzZSBJ TlRFTF9PVVRQVVRfRURQOgotCQlkZGlfdHJhbnNsYXRpb25zID0gaW50ZWxfZGRpX2dldF9idWZf dHJhbnNfZWRwKGRldl9wcml2LAorCQlkZGlfdHJhbnNsYXRpb25zID0gaW50ZWxfZGRpX2dldF9i dWZfdHJhbnNfZWRwKGRldl9wcml2LCBwb3J0LAogCQkJCQkJCSAgICAgICAmbl9lbnRyaWVzKTsK IAkJYnJlYWs7CiAJY2FzZSBJTlRFTF9PVVRQVVRfRFA6Ci0JCWRkaV90cmFuc2xhdGlvbnMgPSBp bnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19kcChkZXZfcHJpdiwKKwkJZGRpX3RyYW5zbGF0aW9ucyA9 IGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2RwKGRldl9wcml2LCBwb3J0LAogCQkJCQkJCSAgICAg ICZuX2VudHJpZXMpOwogCQlicmVhazsKIAljYXNlIElOVEVMX09VVFBVVF9BTkFMT0c6CkBAIC04 MTcsMTYgKzgzNSwxMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmVwYXJlX2RwX2RkaV9idWZmZXJz KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCQlyZXR1cm47CiAJfQogCi0JaWYgKElT X0dFTjlfQkMoZGV2X3ByaXYpKSB7Ci0JCS8qIElmIHdlJ3JlIGJvb3N0aW5nIHRoZSBjdXJyZW50 LCBzZXQgYml0IDMxIG9mIHRyYW5zMSAqLwotCQlpZiAoZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9p bmZvW3BvcnRdLmRwX2Jvb3N0X2xldmVsKQotCQkJaWJvb3N0X2JpdCA9IERESV9CVUZfQkFMQU5D RV9MRUdfRU5BQkxFOwotCi0JCWlmIChXQVJOX09OKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VU UFVUX0VEUCAmJgotCQkJICAgIHBvcnQgIT0gUE9SVF9BICYmIHBvcnQgIT0gUE9SVF9FICYmCi0J CQkgICAgbl9lbnRyaWVzID4gOSkpCi0JCQluX2VudHJpZXMgPSA5OwotCX0KKwkvKiBJZiB3ZSdy ZSBib29zdGluZyB0aGUgY3VycmVudCwgc2V0IGJpdCAzMSBvZiB0cmFuczEgKi8KKwlpZiAoSVNf R0VOOV9CQyhkZXZfcHJpdikgJiYKKwkgICAgZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZvW3Bv cnRdLmRwX2Jvb3N0X2xldmVsKQorCQlpYm9vc3RfYml0ID0gRERJX0JVRl9CQUxBTkNFX0xFR19F TkFCTEU7CiAKIAlmb3IgKGkgPSAwOyBpIDwgbl9lbnRyaWVzOyBpKyspIHsKIAkJSTkxNV9XUklU RShERElfQlVGX1RSQU5TX0xPKHBvcnQsIGkpLApAQCAtMTgzMSwxNCArMTg0Myw5IEBAIHN0YXRp YyB2b2lkIHNrbF9kZGlfc2V0X2lib29zdChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAkJaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpCiAJCQlkZGlfdHJhbnNsYXRpb25zID0g aW50ZWxfZGRpX2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50cmllcyk7CiAJCWVs c2UgaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkKLQkJCWRkaV90cmFuc2xhdGlvbnMgPSBp bnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19lZHAoZGV2X3ByaXYsICZuX2VudHJpZXMpOworCQkJZGRp X3RyYW5zbGF0aW9ucyA9IGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2VkcChkZXZfcHJpdiwgcG9y dCwgJm5fZW50cmllcyk7CiAJCWVsc2UKLQkJCWRkaV90cmFuc2xhdGlvbnMgPSBpbnRlbF9kZGlf Z2V0X2J1Zl90cmFuc19kcChkZXZfcHJpdiwgJm5fZW50cmllcyk7Ci0KLQkJaWYgKFdBUk5fT04o dHlwZSAhPSBJTlRFTF9PVVRQVVRfSERNSSAmJgotCQkJICAgIHBvcnQgIT0gUE9SVF9BICYmCi0J CQkgICAgcG9ydCAhPSBQT1JUX0UgJiYgbl9lbnRyaWVzID4gOSkpCi0JCQluX2VudHJpZXMgPSA5 OworCQkJZGRpX3RyYW5zbGF0aW9ucyA9IGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2RwKGRldl9w cml2LCBwb3J0LCAmbl9lbnRyaWVzKTsKIAogCQlpYm9vc3QgPSBkZGlfdHJhbnNsYXRpb25zW2xl dmVsXS5pX2Jvb3N0OwogCX0KQEAgLTE4ODAsNiArMTg4Nyw3IEBAIHN0YXRpYyB2b2lkIGJ4dF9k ZGlfdnN3aW5nX3NlcXVlbmNlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogdTggaW50 ZWxfZGRpX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFz ZS5kZXYpOworCWVudW0gcG9ydCBwb3J0ID0gZW5jb2Rlci0+cG9ydDsKIAlpbnQgbl9lbnRyaWVz OwogCiAJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSB7CkBAIC0xODk0LDkgKzE5MDIsOSBA QCB1OCBpbnRlbF9kZGlfZHBfdm9sdGFnZV9tYXgoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIpCiAJCQlieHRfZ2V0X2J1Zl90cmFuc19kcChkZXZfcHJpdiwgJm5fZW50cmllcyk7CiAJfSBl bHNlIHsKIAkJaWYgKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkKLQkJCWludGVs X2RkaV9nZXRfYnVmX3RyYW5zX2VkcChkZXZfcHJpdiwgJm5fZW50cmllcyk7CisJCQlpbnRlbF9k ZGlfZ2V0X2J1Zl90cmFuc19lZHAoZGV2X3ByaXYsIHBvcnQsICZuX2VudHJpZXMpOwogCQllbHNl Ci0JCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19kcChkZXZfcHJpdiwgJm5fZW50cmllcyk7CisJ CQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19kcChkZXZfcHJpdiwgcG9ydCwgJm5fZW50cmllcyk7 CiAJfQogCiAJaWYgKFdBUk5fT04obl9lbnRyaWVzIDwgMSkpCi0tIAoyLjEzLjYKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=