From: Mika Kuoppala Subject: [PATCH 4/5] drm/i915/icl: Deal with GT INT DW correctly Date: Fri, 6 Apr 2018 12:32:37 +0300 Message-ID: <20180406093237.14548-1-mika.kuoppala@linux.intel.com> References: <20180405140052.10682-4-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D1516E0A1 for ; Fri, 6 Apr 2018 09:33:05 +0000 (UTC) In-Reply-To: <20180405140052.10682-4-mika.kuoppala@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 RnJvbTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KCkJTcGVjIHNheXM6Cgoi U2Vjb25kIGxldmVsIGludGVycnVwdCBldmVudHMgYXJlIHN0b3JlZCBpbiB0aGUgR1QgSU5UIERX LiBHVCBJTlQgRFcgaXMKYSBkb3VibGUgYnVmZmVyZWQgc3RydWN0dXJlLiBBIHNuYXBzaG90IG9m IGV2ZW50cyBpcyB0YWtlbiB3aGVuIFNXIHJlYWRzCkdUIElOVCBEVy4gRnJvbSB0aGUgdGltZSBv ZiByZWFkIHRvIHRoZSB0aW1lIG9mIFNXIGNvbXBsZXRlbHkgY2xlYXJpbmcKR1QgSU5UIERXICh0 byBpbmRpY2F0ZSBlbmQgb2Ygc2VydmljZSksIGFsbCBpbmNvbWluZyBpbnRlcnJ1cHRzIGFyZSBs b2dnZWQKaW4gYSBzZWNvbmRhcnkgc3RvcmFnZSBzdHJ1Y3R1cmUuIHRoaXMgZ3VhcmFudGVlcyB0 aGF0IHRoZSByZWNvcmQgb2YKaW50ZXJydXB0cyBTVyBpcyBzZXJ2aWNpbmcgd2lsbCBub3QgY2hh bmdlIHdoaWxlIHVuZGVyIHNlcnZpY2UiLgoKV2UgcmVhZCBHVCBJTlQgRFcgaW4gc2V2ZXJhbCBw bGFjZXMgbm93OgoKLSBUaGUgSVJRIGhhbmRsZXIgKGJhbmtzIDAgYW5kIDEpIHdoZXJlLCBob3Bl ZnVsbHksIGl0IGlzIGNvbXBsZXRlbHkKICBjbGVhcmVkIChvcGVyYXRpb24gbm93IGNvdmVyZWQg d2l0aCB0aGUgaXJxIGxvY2spLgotIFRoZSAncmVzZXQnIGludGVycnVwdHMgZnVuY3Rpb25zIGZv ciBSUFMgYW5kIEd1QyBsb2dzLCB3aGVyZSB3ZSBjbGVhcgogIHRoZSBiaXQgd2UgYXJlIGludGVy ZXN0ZWQgaW4gYW5kIGxlYXZlIHRoZSBvdGhlcnMgZm9yIHRoZSBub3JtYWwKICBpbnRlcnJ1cHQg aGFuZGxlci4KLSBUaGUgJ2VuYWJsZScgaW50ZXJydXB0cyBmdW5jdGlvbnMgZm9yIFJQUyBhbmQg R3VDIGxvZ3MsIGFzIGEgbWVhc3VyZQogIG9mIHByZWNhdXRpb24uIEhlcmUgd2UgY291bGQgcmVs YXggYSBiaXQgYW5kIGRvbid0IGNoZWNrIEdUIElOVCBEVwogIGF0IGFsbCBvciwgaWYgd2UgZG8s IGF0IGxlYXN0IHdlIHNob3VsZCBjbGVhciB0aGUgb2ZmZW5kaW5nIGJpdAogICh3aGljaCBpcyB3 aGF0IHRoaXMgcGF0Y2ggZG9lcykuCgpOb3RlIHRoYXQsIGlmIGV2ZXJ5IGJpdCBpcyBjbGVhcmVk IG9uIHJlYWRpbmcgR1QgSU5UIERXLCB0aGUgcmVnaXN0ZXIKd29uJ3QgYmUgbG9ja2VkLiBBbHNv IG5vdGUgdGhhdCwgYWNjb3JkaW5nIHRvIHRoZSBCU3BlYywgR1QgSU5UIERXCmNhbm5vdCBiZSBj bGVhcmVkIHdpdGhvdXQgZmlyc3Qgc2VydmljaW5nIHRoZSBTZWxlY3RvciAmIFNoYXJlZCBJSVIK cmVnaXN0ZXJzLgoKdjI6CiAgLSBSZW1vdmUgc29tZSBjb2RlIGR1cGxpY2F0aW9uIChUdnJ0a28p CiAgLSBNYWtlIHN1cmUgR1RfSU5UUl9EVyBhcmUgcHJvdGVjdGVkIGJ5IHRoZSBpcnEgc3Bpbmxv Y2ssIHNpbmNlIGl0J3MgYQogICAgZ2xvYmFsIHJlc291cmNlIChUdnJ0a28pCgp2MzogT3B0aW1p emUgdGhlIHNwaW5sb2NrIChUdnJ0a28pCgp2NDogUmViYXNlLgp2NToKICAtIHRha2Ugc3Bpbmxv Y2sgb24gb3V0ZXIgc2NvcGUgdG8gcGxlYXNlIHNwYXJzZSAoTWlrYSkKICAtIHVzZSByYXdfcmVn IGFjY2Vzc29ycyAoTWlrYSkKdjY6IG9taXQgdGhlIGNvbnRpbnVlIGluIGxvb3BpbmcgYmFua3Mg KE1pY2hlbCkKCkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpD YzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVsLmNv bT4KQ2M6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPiAodjQpClNpZ25lZC1v ZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgMTEwICsrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3MyBpbnNlcnRpb25zKCspLCAz NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAzNmE2MzU0NzVhNzQu LmMyZjg3OGFjZTBlYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yNDMsNiArMjQzLDQx IEBAIHZvaWQgaTkxNV9ob3RwbHVnX2ludGVycnVwdF91cGRhdGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsK IH0KIAorc3RhdGljIHUzMgorZ2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICogY29uc3QgaTkxNSwKKwkJCSBjb25zdCB1bnNpZ25lZCBpbnQgYmFuaywgY29u c3QgdW5zaWduZWQgaW50IGJpdCk7CisKK3N0YXRpYyBib29sIGdlbjExX3Jlc2V0X29uZV9paXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1LAorCQkJCWNvbnN0IHVuc2lnbmVk IGludCBiYW5rLAorCQkJCWNvbnN0IHVuc2lnbmVkIGludCBiaXQpCit7CisJdm9pZCBfX2lvbWVt ICogY29uc3QgcmVncyA9IGk5MTUtPnJlZ3M7CisJdTMyIGR3OworCisJbG9ja2RlcF9hc3NlcnRf aGVsZCgmaTkxNS0+aXJxX2xvY2spOworCisJZHcgPSByYXdfcmVnX3JlYWQocmVncywgR0VOMTFf R1RfSU5UUl9EVyhiYW5rKSk7CisJaWYgKGR3ICYgQklUKGJpdCkpIHsKKwkJLyoKKwkJICogQWNj b3JkaW5nIHRvIHRoZSBCU3BlYywgRFdfSUlSIGJpdHMgY2Fubm90IGJlIGNsZWFyZWQgd2l0aG91 dAorCQkgKiBmaXJzdCBzZXJ2aWNpbmcgdGhlIFNlbGVjdG9yICYgU2hhcmVkIElJUiByZWdpc3Rl cnMuCisJCSAqLworCQlnZW4xMV9ndF9lbmdpbmVfaWRlbnRpdHkoaTkxNSwgYmFuaywgYml0KTsK KworCQkvKgorCQkgKiBXZSBsb2NrZWQgR1QgSU5UIERXIGJ5IHJlYWRpbmcgaXQuIElmIHdlIHdh bnQgdG8gKHRyeQorCQkgKiB0bykgcmVjb3ZlciBmcm9tIHRoaXMgc3VjY2VzZnVsbHksIHdlIG5l ZWQgdG8gY2xlYXIKKwkJICogb3VyIGJpdCwgb3RoZXJ3aXNlIHdlIGFyZSBsb2NraW5nIHRoZSBy ZWdpc3RlciBmb3IKKwkJICogZXZlcnlib2R5LgorCQkgKi8KKwkJcmF3X3JlZ193cml0ZShyZWdz LCBHRU4xMV9HVF9JTlRSX0RXKGJhbmspLCBCSVQoYml0KSk7CisKKwkJcmV0dXJuIHRydWU7CisJ fQorCisJcmV0dXJuIGZhbHNlOworfQorCiAvKioKICAqIGlsa191cGRhdGVfZGlzcGxheV9pcnEg LSB1cGRhdGUgREVJTVIKICAqIEBkZXZfcHJpdjogZHJpdmVyIHByaXZhdGUKQEAgLTQxMiwyNiAr NDQ3LDEyIEBAIHN0YXRpYyB2b2lkIGdlbjZfZGlzYWJsZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgZGlzYWJsZV9tCiAJLyogdGhvdWdoIGEgYmFycmllciBp cyBtaXNzaW5nIGhlcmUsIGJ1dCBkb24ndCByZWFsbHkgbmVlZCBhIG9uZSAqLwogfQogCi1zdGF0 aWMgdTMyCi1nZW4xMV9ndF9lbmdpbmVfaWRlbnRpdHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KiBjb25zdCBpOTE1LAotCQkJIGNvbnN0IHVuc2lnbmVkIGludCBiYW5rLCBjb25zdCB1bnNpZ25l ZCBpbnQgYml0KTsKLQogdm9pZCBnZW4xMV9yZXNldF9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JdTMyIGR3OwotCiAJc3Bpbl9sb2NrX2lycSgm ZGV2X3ByaXYtPmlycV9sb2NrKTsKIAotCS8qCi0JICogQWNjb3JkaW5nIHRvIHRoZSBCU3BlYywg RFdfSUlSIGJpdHMgY2Fubm90IGJlIGNsZWFyZWQgd2l0aG91dAotCSAqIGZpcnN0IHNlcnZpY2lu ZyB0aGUgU2VsZWN0b3IgJiBTaGFyZWQgSUlSIHJlZ2lzdGVycy4KLQkgKi8KLQlkdyA9IEk5MTVf UkVBRF9GVyhHRU4xMV9HVF9JTlRSX0RXMCk7Ci0Jd2hpbGUgKGR3ICYgQklUKEdFTjExX0dUUE0p KSB7Ci0JCWdlbjExX2d0X2VuZ2luZV9pZGVudGl0eShkZXZfcHJpdiwgMCwgR0VOMTFfR1RQTSk7 Ci0JCUk5MTVfV1JJVEVfRlcoR0VOMTFfR1RfSU5UUl9EVzAsIEJJVChHRU4xMV9HVFBNKSk7Ci0J CWR3ID0gSTkxNV9SRUFEX0ZXKEdFTjExX0dUX0lOVFJfRFcwKTsKLQl9CisJd2hpbGUgKGdlbjEx X3Jlc2V0X29uZV9paXIoZGV2X3ByaXYsIDAsIEdFTjExX0dUUE0pKQorCQk7CiAKIAlkZXZfcHJp di0+Z3RfcG0ucnBzLnBtX2lpciA9IDA7CiAKQEAgLTQ1NSwxMCArNDc2LDEyIEBAIHZvaWQgZ2Vu Nl9lbmFibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlXQVJOX09OX09OQ0Uo cnBzLT5wbV9paXIpOworCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCi0JCVdBUk5f T05fT05DRShJOTE1X1JFQURfRlcoR0VOMTFfR1RfSU5UUl9EVzApICYgQklUKEdFTjExX0dUUE0p KTsKKwkJV0FSTl9PTl9PTkNFKGdlbjExX3Jlc2V0X29uZV9paXIoZGV2X3ByaXYsIDAsIEdFTjEx X0dUUE0pKTsKIAllbHNlCiAJCVdBUk5fT05fT05DRShJOTE1X1JFQUQoZ2VuNl9wbV9paXIoZGV2 X3ByaXYpKSAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKKwogCXJwcy0+aW50ZXJydXB0c19l bmFibGVkID0gdHJ1ZTsKIAlnZW42X2VuYWJsZV9wbV9pcnEoZGV2X3ByaXYsIGRldl9wcml2LT5w bV9ycHNfZXZlbnRzKTsKIApAQCAtMjc3OCw2ICsyODAxLDggQEAgZ2VuMTFfZ3RfZW5naW5lX2lk ZW50aXR5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogY29uc3QgaTkxNSwKIAl1MzIgdGltZW91 dF90czsKIAl1MzIgaWRlbnQ7CiAKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5pcnFfbG9j ayk7CisKIAlyYXdfcmVnX3dyaXRlKHJlZ3MsIEdFTjExX0lJUl9SRUdfU0VMRUNUT1IoYmFuayks IEJJVChiaXQpKTsKIAogCS8qCkBAIC0yODUzLDM2ICsyODc4LDQ3IEBAIGdlbjExX2d0X2lkZW50 aXR5X2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1LAogfQogCiBz dGF0aWMgdm9pZAotZ2VuMTFfZ3RfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KiBjb25zdCBpOTE1LAotCQkgICAgIGNvbnN0IHUzMiBtYXN0ZXJfY3RsKQorZ2VuMTFfZ3RfYmFu a19oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogY29uc3QgaTkxNSwKKwkJICAgICAg Y29uc3QgdW5zaWduZWQgaW50IGJhbmspCiB7CiAJdm9pZCBfX2lvbWVtICogY29uc3QgcmVncyA9 IGk5MTUtPnJlZ3M7Ci0JdW5zaWduZWQgaW50IGJhbms7CisJdW5zaWduZWQgbG9uZyBpbnRyX2R3 OworCXVuc2lnbmVkIGludCBiaXQ7CiAKLQlmb3IgKGJhbmsgPSAwOyBiYW5rIDwgMjsgYmFuaysr KSB7Ci0JCXVuc2lnbmVkIGxvbmcgaW50cl9kdzsKLQkJdW5zaWduZWQgaW50IGJpdDsKKwlsb2Nr ZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5pcnFfbG9jayk7CiAKLQkJaWYgKCEobWFzdGVyX2N0bCAm IEdFTjExX0dUX0RXX0lSUShiYW5rKSkpCi0JCQljb250aW51ZTsKKwlpbnRyX2R3ID0gcmF3X3Jl Z19yZWFkKHJlZ3MsIEdFTjExX0dUX0lOVFJfRFcoYmFuaykpOwogCi0JCWludHJfZHcgPSByYXdf cmVnX3JlYWQocmVncywgR0VOMTFfR1RfSU5UUl9EVyhiYW5rKSk7CisJaWYgKHVubGlrZWx5KCFp bnRyX2R3KSkgeworCQlEUk1fRVJST1IoIkdUX0lOVFJfRFcldSBibGFuayFcbiIsIGJhbmspOwor CQlyZXR1cm47CisJfQogCi0JCWlmICh1bmxpa2VseSghaW50cl9kdykpIHsKLQkJCURSTV9FUlJP UigiR1RfSU5UUl9EVyV1IGJsYW5rIVxuIiwgYmFuayk7Ci0JCQljb250aW51ZTsKLQkJfQorCWZv cl9lYWNoX3NldF9iaXQoYml0LCAmaW50cl9kdywgMzIpIHsKKwkJY29uc3QgdTMyIGlkZW50ID0g Z2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KGk5MTUsCisJCQkJCQkJICAgYmFuaywgYml0KTsKIAot CQlmb3JfZWFjaF9zZXRfYml0KGJpdCwgJmludHJfZHcsIDMyKSB7Ci0JCQljb25zdCB1MzIgaWRl bnQgPSBnZW4xMV9ndF9lbmdpbmVfaWRlbnRpdHkoaTkxNSwKLQkJCQkJCQkJICAgYmFuaywgYml0 KTsKKwkJZ2VuMTFfZ3RfaWRlbnRpdHlfaGFuZGxlcihpOTE1LCBpZGVudCk7CisJfQogCi0JCQln ZW4xMV9ndF9pZGVudGl0eV9oYW5kbGVyKGk5MTUsIGlkZW50KTsKLQkJfQorCS8qIENsZWFyIG11 c3QgYmUgYWZ0ZXIgc2hhcmVkIGhhcyBiZWVuIHNlcnZlZCBmb3IgZW5naW5lICovCisJcmF3X3Jl Z193cml0ZShyZWdzLCBHRU4xMV9HVF9JTlRSX0RXKGJhbmspLCBpbnRyX2R3KTsKK30KIAotCQkv KiBDbGVhciBtdXN0IGJlIGFmdGVyIHNoYXJlZCBoYXMgYmVlbiBzZXJ2ZWQgZm9yIGVuZ2luZSAq LwotCQlyYXdfcmVnX3dyaXRlKHJlZ3MsIEdFTjExX0dUX0lOVFJfRFcoYmFuayksIGludHJfZHcp Oworc3RhdGljIHZvaWQKK2dlbjExX2d0X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICogY29uc3QgaTkxNSwKKwkJICAgICBjb25zdCB1MzIgbWFzdGVyX2N0bCkKK3sKKwl1bnNp Z25lZCBpbnQgYmFuazsKKworCXNwaW5fbG9jaygmaTkxNS0+aXJxX2xvY2spOworCisJZm9yIChi YW5rID0gMDsgYmFuayA8IDI7IGJhbmsrKykgeworCQlpZiAobWFzdGVyX2N0bCAmIEdFTjExX0dU X0RXX0lSUShiYW5rKSkKKwkJCWdlbjExX2d0X2JhbmtfaGFuZGxlcihpOTE1LCBiYW5rKTsKIAl9 CisKKwlzcGluX3VubG9jaygmaTkxNS0+aXJxX2xvY2spOwogfQogCiBzdGF0aWMgaXJxcmV0dXJu X3QgZ2VuMTFfaXJxX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqYXJnKQotLSAKMi4xNC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK