From: Mika Kuoppala Subject: [PATCH 6/8] drm/i915/icl: Handle RPS interrupts correctly for Gen11 Date: Fri, 16 Mar 2018 14:14:54 +0200 Message-ID: <20180316121456.11577-6-mika.kuoppala@linux.intel.com> References: <20180316121456.11577-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 295146EB36 for ; Fri, 16 Mar 2018 12:15:19 +0000 (UTC) In-Reply-To: <20180316121456.11577-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 YmFzZQoKQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBE YW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpD YzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IFBhdWxv IFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBN YXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMgIHwgNzMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jICB8ICA2ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgNjYgaW5zZXJ0aW9u cygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggODI4ZjMx MDQ0ODhjLi44YzQ1MTBmZmU2MjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMzA4LDE3 ICszMDgsMjkgQEAgdm9pZCBnZW41X2Rpc2FibGVfZ3RfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwgdWludDMyX3QgbWFzaykKIAogc3RhdGljIGk5MTVfcmVnX3QgZ2VuNl9w bV9paXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCVdBUk5fT05fT05D RShJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKTsKKwogCXJldHVybiBJTlRFTF9HRU4oZGV2X3By aXYpID49IDggPyBHRU44X0dUX0lJUigyKSA6IEdFTjZfUE1JSVI7CiB9CiAKIHN0YXRpYyBpOTE1 X3JlZ190IGdlbjZfcG1faW1yKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK LQlyZXR1cm4gSU5URUxfR0VOKGRldl9wcml2KSA+PSA4ID8gR0VOOF9HVF9JTVIoMikgOiBHRU42 X1BNSU1SOworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQorCQlyZXR1cm4gR0VOMTFf R1BNX1dHQk9YUEVSRl9JTlRSX01BU0s7CisJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSA4KQorCQlyZXR1cm4gR0VOOF9HVF9JTVIoMik7CisJZWxzZQorCQlyZXR1cm4gR0VONl9QTUlN UjsKIH0KIAogc3RhdGljIGk5MTVfcmVnX3QgZ2VuNl9wbV9pZXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewotCXJldHVybiBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDggPyBH RU44X0dUX0lFUigyKSA6IEdFTjZfUE1JRVI7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g MTEpCisJCXJldHVybiBHRU4xMV9HUE1fV0dCT1hQRVJGX0lOVFJfRU5BQkxFOworCWVsc2UgaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkKKwkJcmV0dXJuIEdFTjhfR1RfSUVSKDIpOworCWVs c2UKKwkJcmV0dXJuIEdFTjZfUE1JRVI7CiB9CiAKIC8qKgpAQCAtNDAwLDYgKzQxMiwzMiBAQCBz dGF0aWMgdm9pZCBnZW42X2Rpc2FibGVfcG1faXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgdTMyIGRpc2FibGVfbQogCS8qIHRob3VnaCBhIGJhcnJpZXIgaXMgbWlzc2luZyBo ZXJlLCBidXQgZG9uJ3QgcmVhbGx5IG5lZWQgYSBvbmUgKi8KIH0KIAorc3RhdGljIHUzMgorZ2Vu MTFfZ3RfZW5naW5lX2ludHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1LAor CQkgICAgIGNvbnN0IHVuc2lnbmVkIGludCBiYW5rLCBjb25zdCB1bnNpZ25lZCBpbnQgYml0KTsK Kwordm9pZCBnZW4xMV9yZXNldF9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCit7CisJdTMyIGR3OworCisJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmly cV9sb2NrKTsKKworCS8qCisJICogQWNjb3JkaW5nIHRvIHRoZSBCU3BlYywgRFdfSUlSIGJpdHMg Y2Fubm90IGJlIGNsZWFyZWQgd2l0aG91dAorCSAqIGZpcnN0IHNlcnZpY2luZyB0aGUgU2VsZWN0 b3IgJiBTaGFyZWQgSUlSIHJlZ2lzdGVycy4KKwkgKi8KKwlkdyA9IEk5MTVfUkVBRF9GVyhHRU4x MV9HVF9JTlRSX0RXMCk7CisJd2hpbGUgKGR3ICYgQklUKEdFTjExX0dUUE0pKSB7CisJCWdlbjEx X2d0X2VuZ2luZV9pbnRyKGRldl9wcml2LCAwLCBHRU4xMV9HVFBNKTsKKwkJSTkxNV9XUklURV9G VyhHRU4xMV9HVF9JTlRSX0RXMCwgQklUKEdFTjExX0dUUE0pKTsKKwkJZHcgPSBJOTE1X1JFQURf RlcoR0VOMTFfR1RfSU5UUl9EVzApOworCX0KKworCWRldl9wcml2LT5ndF9wbS5ycHMucG1faWly ID0gMDsKKworCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKK30KKwogdm9p ZCBnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKIAlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwpAQCAtNDE1LDEy ICs0NTMsMTIgQEAgdm9pZCBnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKFJFQURfT05DRShycHMtPmludGVycnVwdHNfZW5h YmxlZCkpCiAJCXJldHVybjsKIAotCWlmIChXQVJOX09OX09OQ0UoSVNfR0VOMTEoZGV2X3ByaXYp KSkKLQkJcmV0dXJuOwotCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlX QVJOX09OX09OQ0UocnBzLT5wbV9paXIpOwotCVdBUk5fT05fT05DRShJOTE1X1JFQUQoZ2VuNl9w bV9paXIoZGV2X3ByaXYpKSAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKKwlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSAxMSkKKwkJV0FSTl9PTl9PTkNFKEk5MTVfUkVBRF9GVyhHRU4xMV9H VF9JTlRSX0RXMCkgJiBCSVQoR0VOMTFfR1RQTSkpOworCWVsc2UKKwkJV0FSTl9PTl9PTkNFKEk5 MTVfUkVBRChnZW42X3BtX2lpcihkZXZfcHJpdikpICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMp OwogCXJwcy0+aW50ZXJydXB0c19lbmFibGVkID0gdHJ1ZTsKIAlnZW42X2VuYWJsZV9wbV9pcnEo ZGV2X3ByaXYsIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKIApAQCAtNDM0LDkgKzQ3Miw2IEBA IHZvaWQgZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlpZiAoIVJFQURfT05DRShycHMtPmludGVycnVwdHNfZW5hYmxlZCkpCiAJ CXJldHVybjsKIAotCWlmIChXQVJOX09OX09OQ0UoSVNfR0VOMTEoZGV2X3ByaXYpKSkKLQkJcmV0 dXJuOwotCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlycHMtPmludGVy cnVwdHNfZW5hYmxlZCA9IGZhbHNlOwogCkBAIC00NTMsNyArNDg4LDEwIEBAIHZvaWQgZ2VuNl9k aXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAkgKiBzdGF0ZSBvZiB0aGUgd29ya2VyIGNhbiBiZSBkaXNjYXJkZWQuCiAJICovCiAJY2FuY2Vs X3dvcmtfc3luYygmcnBzLT53b3JrKTsKLQlnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKGRldl9w cml2KTsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkKKwkJZ2VuMTFfcmVzZXRfcnBz X2ludGVycnVwdHMoZGV2X3ByaXYpOworCWVsc2UKKwkJZ2VuNl9yZXNldF9ycHNfaW50ZXJydXB0 cyhkZXZfcHJpdik7CiB9CiAKIHZvaWQgZ2VuOV9yZXNldF9ndWNfaW50ZXJydXB0cyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0yNzUwLDYgKzI3ODgsOSBAQCBnZW4xMV9n dF9lbmdpbmVfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1 LAogCiAJCWNhc2UgR0VOMTFfQkNTOgogCQkJcmV0dXJuIGdlbjhfY3NfaXJxX2hhbmRsZXIoZW5n aW5lW0JDU10sIGlpcik7CisKKwkJY2FzZSBHRU4xMV9HVFBNOgorCQkJcmV0dXJuIGdlbjZfcnBz X2lycV9oYW5kbGVyKGk5MTUsIGlpcik7CiAJCX0KIAljYXNlIDE6CiAJCXN3aXRjaCAoZW5naW5l X24pIHsKQEAgLTMzMTQsNiArMzM1NSw5IEBAIHN0YXRpYyB2b2lkIGdlbjExX2d0X2lycV9yZXNl dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJSTkxNV9XUklURShHRU4xMV9W Q1MwX1ZDUzFfSU5UUl9NQVNLLAl+MCk7CiAJSTkxNV9XUklURShHRU4xMV9WQ1MyX1ZDUzNfSU5U Ul9NQVNLLAl+MCk7CiAJSTkxNV9XUklURShHRU4xMV9WRUNTMF9WRUNTMV9JTlRSX01BU0ssCX4w KTsKKworCUk5MTVfV1JJVEUoR0VOMTFfR1BNX1dHQk9YUEVSRl9JTlRSX0VOQUJMRSwgMCk7CisJ STkxNV9XUklURShHRU4xMV9HUE1fV0dCT1hQRVJGX0lOVFJfTUFTSywgIH4wKTsKIH0KIAogc3Rh dGljIHZvaWQgZ2VuMTFfaXJxX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC0zODUy LDcgKzM4OTYsMTQgQEAgc3RhdGljIHZvaWQgZ2VuMTFfZ3RfaXJxX3Bvc3RpbnN0YWxsKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlJOTE1X1dSSVRFKEdFTjExX1ZDUzJfVkNT M19JTlRSX01BU0ssCX4oaXJxcyB8IGlycXMgPDwgMTYpKTsKIAlJOTE1X1dSSVRFKEdFTjExX1ZF Q1MwX1ZFQ1MxX0lOVFJfTUFTSywJfihpcnFzIHwgaXJxcyA8PCAxNikpOwogCi0JZGV2X3ByaXYt PnBtX2ltciA9IDB4ZmZmZmZmZmY7IC8qIFRPRE8gKi8KKwkvKgorCSAqIFJQUyBpbnRlcnJ1cHRz IHdpbGwgZ2V0IGVuYWJsZWQvZGlzYWJsZWQgb24gZGVtYW5kIHdoZW4gUlBTIGl0c2VsZgorCSAq IGlzIGVuYWJsZWQvZGlzYWJsZWQuCisJICovCisJZGV2X3ByaXYtPnBtX2llciA9IDB4MDsKKwlk ZXZfcHJpdi0+cG1faW1yID0gfmRldl9wcml2LT5wbV9pZXI7CisJSTkxNV9XUklURShHRU4xMV9H UE1fV0dCT1hQRVJGX0lOVFJfRU5BQkxFLCAwKTsKKwlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JP WFBFUkZfSU5UUl9NQVNLLCAgfjApOwogfQogCiBzdGF0aWMgaW50IGdlbjExX2lycV9wb3N0aW5z dGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl eCBhMjE1YWE3OGIwYmUuLjQ2NWI3NDE0MjBjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK QEAgLTEzMjUsNiArMTMyNSw3IEBAIHZvaWQgZ2VuNV9lbmFibGVfZ3RfaXJxKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgbWFzayk7CiB2b2lkIGdlbjVfZGlzYWJs ZV9ndF9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCBtYXNr KTsKIHZvaWQgZ2VuNl9tYXNrX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHUzMiBtYXNrKTsKIHZvaWQgZ2VuNl91bm1hc2tfcG1faXJxKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc2spOwordm9pZCBnZW4xMV9yZXNldF9ycHNfaW50ZXJy dXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBnZW42X3Jlc2V0 X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lk IGdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7CiB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZGQ1ZGRiNzdi MzA2Li43ZjI0Yzg4NGFjMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtODAyNSwxMCAr ODAyNSwxMCBAQCB2b2lkIGludGVsX3Nhbml0aXplX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGV2X3ByaXYtPmd0X3BtLnJjNi5lbmFibGVkID0gdHJ1 ZTsgLyogZm9yY2UgUkM2IGRpc2FibGluZyAqLwogCWludGVsX2Rpc2FibGVfZ3RfcG93ZXJzYXZl KGRldl9wcml2KTsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgMTEpCi0JCWdlbjZfcmVz ZXRfcnBzX2ludGVycnVwdHMoZGV2X3ByaXYpOworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDExKQorCQlnZW4xMV9yZXNldF9ycHNfaW50ZXJydXB0cyhkZXZfcHJpdik7CiAJZWxzZQotCQlX QVJOX09OX09OQ0UoMSk7CisJCWdlbjZfcmVzZXRfcnBzX2ludGVycnVwdHMoZGV2X3ByaXYpOwog fQogCiBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfZGlzYWJsZV9sbGNfcHN0YXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1KQotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK