From: Mika Kuoppala Subject: [PATCH 3/5] drm/i915/icl: Handle RPS interrupts correctly for Gen11 Date: Thu, 5 Apr 2018 17:00:50 +0300 Message-ID: <20180405140052.10682-3-mika.kuoppala@linux.intel.com> References: <20180405140052.10682-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8559B6E768 for ; Thu, 5 Apr 2018 14:01:23 +0000 (UTC) In-Reply-To: <20180405140052.10682-1-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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KClVzaW5nIHRoZSBuZXcg aGllcmFyY2hpY2FsIGludGVycnVwdCBpbmZyYXN0cnVjdHVyZS4KCnYyOiBSZWJhc2UKdjM6IFJl YmFzZQp2NDogdXNlIGNsYXNzL2luc3RhbmNlIGhhbmRsZXIgKE1pa2EpCgpDYzogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVy aW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+CkNjOiBTYWdhciBBcnVuIEthbWJs ZSA8c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnph bm9uaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0Bp bnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgIHwgNzMg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgIDYgKystLQogNCBm aWxlcyBjaGFuZ2VkLCA2NyBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYwppbmRleCBmOTg0YmYxMmEwYjYuLjBiNDcxNzc1Y2UzOCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCkBAIC0zMDgsMTcgKzMwOCwyOSBAQCB2b2lkIGdlbjVfZGlzYWJsZV9n dF9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCBtYXNrKQog CiBzdGF0aWMgaTkxNV9yZWdfdCBnZW42X3BtX2lpcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7CisJV0FSTl9PTl9PTkNFKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpOwor CiAJcmV0dXJuIElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCA/IEdFTjhfR1RfSUlSKDIpIDogR0VO Nl9QTUlJUjsKIH0KIAogc3RhdGljIGk5MTVfcmVnX3QgZ2VuNl9wbV9pbXIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXJldHVybiBJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDggPyBHRU44X0dUX0lNUigyKSA6IEdFTjZfUE1JTVI7CisJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gMTEpCisJCXJldHVybiBHRU4xMV9HUE1fV0dCT1hQRVJGX0lOVFJfTUFTSzsKKwllbHNl IGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpCisJCXJldHVybiBHRU44X0dUX0lNUigyKTsK KwllbHNlCisJCXJldHVybiBHRU42X1BNSU1SOwogfQogCiBzdGF0aWMgaTkxNV9yZWdfdCBnZW42 X3BtX2llcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JcmV0dXJuIElO VEVMX0dFTihkZXZfcHJpdikgPj0gOCA/IEdFTjhfR1RfSUVSKDIpIDogR0VONl9QTUlFUjsKKwlp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkKKwkJcmV0dXJuIEdFTjExX0dQTV9XR0JPWFBF UkZfSU5UUl9FTkFCTEU7CisJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQorCQly ZXR1cm4gR0VOOF9HVF9JRVIoMik7CisJZWxzZQorCQlyZXR1cm4gR0VONl9QTUlFUjsKIH0KIAog LyoqCkBAIC00MDAsNiArNDEyLDMyIEBAIHN0YXRpYyB2b2lkIGdlbjZfZGlzYWJsZV9wbV9pcnEo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgZGlzYWJsZV9tCiAJLyogdGhv dWdoIGEgYmFycmllciBpcyBtaXNzaW5nIGhlcmUsIGJ1dCBkb24ndCByZWFsbHkgbmVlZCBhIG9u ZSAqLwogfQogCitzdGF0aWMgdTMyCitnZW4xMV9ndF9lbmdpbmVfaWRlbnRpdHkoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1LAorCQkJIGNvbnN0IHVuc2lnbmVkIGludCBiYW5r LCBjb25zdCB1bnNpZ25lZCBpbnQgYml0KTsKKwordm9pZCBnZW4xMV9yZXNldF9ycHNfaW50ZXJy dXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJdTMyIGR3OworCisJ c3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKKworCS8qCisJICogQWNjb3JkaW5n IHRvIHRoZSBCU3BlYywgRFdfSUlSIGJpdHMgY2Fubm90IGJlIGNsZWFyZWQgd2l0aG91dAorCSAq IGZpcnN0IHNlcnZpY2luZyB0aGUgU2VsZWN0b3IgJiBTaGFyZWQgSUlSIHJlZ2lzdGVycy4KKwkg Ki8KKwlkdyA9IEk5MTVfUkVBRF9GVyhHRU4xMV9HVF9JTlRSX0RXMCk7CisJd2hpbGUgKGR3ICYg QklUKEdFTjExX0dUUE0pKSB7CisJCWdlbjExX2d0X2VuZ2luZV9pZGVudGl0eShkZXZfcHJpdiwg MCwgR0VOMTFfR1RQTSk7CisJCUk5MTVfV1JJVEVfRlcoR0VOMTFfR1RfSU5UUl9EVzAsIEJJVChH RU4xMV9HVFBNKSk7CisJCWR3ID0gSTkxNV9SRUFEX0ZXKEdFTjExX0dUX0lOVFJfRFcwKTsKKwl9 CisKKwlkZXZfcHJpdi0+Z3RfcG0ucnBzLnBtX2lpciA9IDA7CisKKwlzcGluX3VubG9ja19pcnEo JmRldl9wcml2LT5pcnFfbG9jayk7Cit9CisKIHZvaWQgZ2VuNl9yZXNldF9ycHNfaW50ZXJydXB0 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3Bpbl9sb2NrX2lycSgm ZGV2X3ByaXYtPmlycV9sb2NrKTsKQEAgLTQxNSwxMiArNDUzLDEyIEBAIHZvaWQgZ2VuNl9lbmFi bGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlm IChSRUFEX09OQ0UocnBzLT5pbnRlcnJ1cHRzX2VuYWJsZWQpKQogCQlyZXR1cm47CiAKLQlpZiAo V0FSTl9PTl9PTkNFKElTX0dFTjExKGRldl9wcml2KSkpCi0JCXJldHVybjsKLQogCXNwaW5fbG9j a19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAJV0FSTl9PTl9PTkNFKHJwcy0+cG1faWlyKTsK LQlXQVJOX09OX09OQ0UoSTkxNV9SRUFEKGdlbjZfcG1faWlyKGRldl9wcml2KSkgJiBkZXZfcHJp di0+cG1fcnBzX2V2ZW50cyk7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCisJCVdB Uk5fT05fT05DRShJOTE1X1JFQURfRlcoR0VOMTFfR1RfSU5UUl9EVzApICYgQklUKEdFTjExX0dU UE0pKTsKKwllbHNlCisJCVdBUk5fT05fT05DRShJOTE1X1JFQUQoZ2VuNl9wbV9paXIoZGV2X3By aXYpKSAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKIAlycHMtPmludGVycnVwdHNfZW5hYmxl ZCA9IHRydWU7CiAJZ2VuNl9lbmFibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBz X2V2ZW50cyk7CiAKQEAgLTQzNCw5ICs0NzIsNiBAQCB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50 ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKCFSRUFEX09O Q0UocnBzLT5pbnRlcnJ1cHRzX2VuYWJsZWQpKQogCQlyZXR1cm47CiAKLQlpZiAoV0FSTl9PTl9P TkNFKElTX0dFTjExKGRldl9wcml2KSkpCi0JCXJldHVybjsKLQogCXNwaW5fbG9ja19pcnEoJmRl dl9wcml2LT5pcnFfbG9jayk7CiAJcnBzLT5pbnRlcnJ1cHRzX2VuYWJsZWQgPSBmYWxzZTsKIApA QCAtNDUzLDcgKzQ4OCwxMCBAQCB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogc3RhdGUgb2YgdGhlIHdvcmtlciBj YW4gYmUgZGlzY2FyZGVkLgogCSAqLwogCWNhbmNlbF93b3JrX3N5bmMoJnJwcy0+d29yayk7Ci0J Z2VuNl9yZXNldF9ycHNfaW50ZXJydXB0cyhkZXZfcHJpdik7CisJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gMTEpCisJCWdlbjExX3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKGRldl9wcml2KTsKKwll bHNlCisJCWdlbjZfcmVzZXRfcnBzX2ludGVycnVwdHMoZGV2X3ByaXYpOwogfQogCiB2b2lkIGdl bjlfcmVzZXRfZ3VjX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQpAQCAtMjc2OCw2ICsyODA2LDkgQEAgc3RhdGljIHZvaWQKIGdlbjExX290aGVyX2lycV9oYW5k bGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogY29uc3QgaTkxNSwKIAkJCWNvbnN0IHU4IGlu c3RhbmNlLCBjb25zdCB1MTYgaWlyKQogeworCWlmIChpbnN0YW5jZSA9PSBPVEhFUl9HVFBNX0lO U1RBTkNFKQorCQlyZXR1cm4gZ2VuNl9ycHNfaXJxX2hhbmRsZXIoaTkxNSwgaWlyKTsKKwogCVdB Uk5fT05DRSgxLCAidW5oYW5kbGVkIG90aGVyIGludGVycnVwdCBpbnN0YW5jZT0weCV4LCBpaXI9 MHgleFxuIiwKIAkJICBpbnN0YW5jZSwgaWlyKTsKIH0KQEAgLTMzMzMsNiArMzM3NCw5IEBAIHN0 YXRpYyB2b2lkIGdlbjExX2d0X2lycV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJSTkxNV9XUklURShHRU4xMV9WQ1MwX1ZDUzFfSU5UUl9NQVNLLAl+MCk7CiAJSTkx NV9XUklURShHRU4xMV9WQ1MyX1ZDUzNfSU5UUl9NQVNLLAl+MCk7CiAJSTkxNV9XUklURShHRU4x MV9WRUNTMF9WRUNTMV9JTlRSX01BU0ssCX4wKTsKKworCUk5MTVfV1JJVEUoR0VOMTFfR1BNX1dH Qk9YUEVSRl9JTlRSX0VOQUJMRSwgMCk7CisJSTkxNV9XUklURShHRU4xMV9HUE1fV0dCT1hQRVJG X0lOVFJfTUFTSywgIH4wKTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuMTFfaXJxX3Jlc2V0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCkBAIC0zODcxLDcgKzM5MTUsMTQgQEAgc3RhdGljIHZvaWQgZ2Vu MTFfZ3RfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAlJOTE1X1dSSVRFKEdFTjExX1ZDUzJfVkNTM19JTlRSX01BU0ssCX4oaXJxcyB8IGlycXMgPDwg MTYpKTsKIAlJOTE1X1dSSVRFKEdFTjExX1ZFQ1MwX1ZFQ1MxX0lOVFJfTUFTSywJfihpcnFzIHwg aXJxcyA8PCAxNikpOwogCi0JZGV2X3ByaXYtPnBtX2ltciA9IDB4ZmZmZmZmZmY7IC8qIFRPRE8g Ki8KKwkvKgorCSAqIFJQUyBpbnRlcnJ1cHRzIHdpbGwgZ2V0IGVuYWJsZWQvZGlzYWJsZWQgb24g ZGVtYW5kIHdoZW4gUlBTIGl0c2VsZgorCSAqIGlzIGVuYWJsZWQvZGlzYWJsZWQuCisJICovCisJ ZGV2X3ByaXYtPnBtX2llciA9IDB4MDsKKwlkZXZfcHJpdi0+cG1faW1yID0gfmRldl9wcml2LT5w bV9pZXI7CisJSTkxNV9XUklURShHRU4xMV9HUE1fV0dCT1hQRVJGX0lOVFJfRU5BQkxFLCAwKTsK KwlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9NQVNLLCAgfjApOwogfQogCiBz dGF0aWMgaW50IGdlbjExX2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggZDRiNWZiYTdhMmRjLi5iM2E2NDI4YWE3MWQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMTg4LDYgKzE4OCw3IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBpOTE1X21taW9fcmVnX3ZhbGlkKGk5MTVfcmVnX3QgcmVnKQogI2RlZmluZSBPVEhFUl9D TEFTUwkJNAogI2RlZmluZSBNQVhfRU5HSU5FX0NMQVNTCTQKIAorI2RlZmluZSBPVEhFUl9HVFBN X0lOU1RBTkNFCTEKICNkZWZpbmUgTUFYX0VOR0lORV9JTlNUQU5DRSAgICAzCiAKIC8qIFBDSSBj b25maWcgc3BhY2UgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZDE0NTJmZDJhNThk Li44NWU0ODNlOWE0NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMzI5LDYgKzEz MjksNyBAQCB2b2lkIGdlbjVfZW5hYmxlX2d0X2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIHVpbnQzMl90IG1hc2spOwogdm9pZCBnZW41X2Rpc2FibGVfZ3RfaXJxKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgbWFzayk7CiB2b2lkIGdlbjZf bWFza19wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgbWFzayk7 CiB2b2lkIGdlbjZfdW5tYXNrX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHUzMiBtYXNrKTsKK3ZvaWQgZ2VuMTFfcmVzZXRfcnBzX2ludGVycnVwdHMoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgZ2VuNl9yZXNldF9ycHNfaW50ZXJydXB0 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBnZW42X2VuYWJsZV9y cHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBn ZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDE5ZTgyYWFhOTg2My4uYTAxOGM5YWJj MmI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTgwMjgsMTAgKzgwMjgsMTAgQEAgdm9p ZCBpbnRlbF9zYW5pdGl6ZV9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCWRldl9wcml2LT5ndF9wbS5yYzYuZW5hYmxlZCA9IHRydWU7IC8qIGZvcmNlIFJD NiBkaXNhYmxpbmcgKi8KIAlpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShkZXZfcHJpdik7CiAK LQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDExKQotCQlnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1 cHRzKGRldl9wcml2KTsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkKKwkJZ2VuMTFf cmVzZXRfcnBzX2ludGVycnVwdHMoZGV2X3ByaXYpOwogCWVsc2UKLQkJV0FSTl9PTl9PTkNFKDEp OworCQlnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKGRldl9wcml2KTsKIH0KIAogc3RhdGljIGlu bGluZSB2b2lkIGludGVsX2Rpc2FibGVfbGxjX3BzdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSkKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==