From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 2/3] drm/i915: Remove some legacy mmio accessors from interrupt handling Date: Tue, 2 Jul 2019 11:23:12 +0100 Message-ID: <20190702102313.9333-3-tvrtko.ursulin@linux.intel.com> References: <20190702102313.9333-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 830F789AC2 for ; Tue, 2 Jul 2019 10:23:25 +0000 (UTC) In-Reply-To: <20190702102313.9333-1-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vc3RseSBp biBnZW4xMSBpbnRlcnJ1cHQgaGFuZGxpbmcgYW5kIGEgY291cGxlIG5laWdoYm91cmluZyBmdW5j dGlvbnMKd2hpY2ggd2VyZSBlYXN5IHNpbmNlIHVuY29yZSBsb2NhbCB3YXMgYWxyZWFkeSBhdmFp bGFibGUuCgpDby1hdXRob3JlZC1ieTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwu Y29tPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgNzUgKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzkgaW5zZXJ0aW9u cygrKSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggOTUyMDUz ZTYxMWY4Li44MTdkZWZmMjBiZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMzQ3OSwx MiArMzQ3OSwxMiBAQCBzdGF0aWMgdm9pZCB2bHZfZGlzcGxheV9pcnFfcmVzZXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSA9 ICZkZXZfcHJpdi0+dW5jb3JlOwogCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQotCQlJ OTE1X1dSSVRFKERQSU5WR1RULCBEUElOVkdUVF9TVEFUVVNfTUFTS19DSFYpOworCQlpbnRlbF91 bmNvcmVfd3JpdGUodW5jb3JlLCBEUElOVkdUVCwgRFBJTlZHVFRfU1RBVFVTX01BU0tfQ0hWKTsK IAllbHNlCi0JCUk5MTVfV1JJVEUoRFBJTlZHVFQsIERQSU5WR1RUX1NUQVRVU19NQVNLKTsKKwkJ aW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgRFBJTlZHVFQsIERQSU5WR1RUX1NUQVRVU19NQVNL KTsKIAogCWk5MTVfaG90cGx1Z19pbnRlcnJ1cHRfdXBkYXRlX2xvY2tlZChkZXZfcHJpdiwgMHhm ZmZmZmZmZiwgMCk7Ci0JSTkxNV9XUklURShQT1JUX0hPVFBMVUdfU1RBVCwgSTkxNV9SRUFEKFBP UlRfSE9UUExVR19TVEFUKSk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgUE9SVF9IT1RQ TFVHX1NUQVQsIEk5MTVfUkVBRChQT1JUX0hPVFBMVUdfU1RBVCkpOwogCiAJaTl4eF9waXBlc3Rh dF9pcnFfcmVzZXQoZGV2X3ByaXYpOwogCkBAIC0zNTMxLDExICszNTMxLDExIEBAIHN0YXRpYyB2 b2lkIGlyb25sYWtlX2lycV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAKIAlHRU4zX0lSUV9SRVNFVCh1bmNvcmUsIERFKTsKIAlpZiAoSVNfR0VOKGRldl9wcml2LCA3 KSkKLQkJSTkxNV9XUklURShHRU43X0VSUl9JTlQsIDB4ZmZmZmZmZmYpOworCQlpbnRlbF91bmNv cmVfd3JpdGUodW5jb3JlLCBHRU43X0VSUl9JTlQsIDB4ZmZmZmZmZmYpOwogCiAJaWYgKElTX0hB U1dFTEwoZGV2X3ByaXYpKSB7Ci0JCUk5MTVfV1JJVEUoRURQX1BTUl9JTVIsIDB4ZmZmZmZmZmYp OwotCQlJOTE1X1dSSVRFKEVEUF9QU1JfSUlSLCAweGZmZmZmZmZmKTsKKwkJaW50ZWxfdW5jb3Jl X3dyaXRlKHVuY29yZSwgRURQX1BTUl9JTVIsIDB4ZmZmZmZmZmYpOworCQlpbnRlbF91bmNvcmVf d3JpdGUodW5jb3JlLCBFRFBfUFNSX0lJUiwgMHhmZmZmZmZmZik7CiAJfQogCiAJZ2VuNV9ndF9p cnFfcmVzZXQoZGV2X3ByaXYpOwpAQCAtMzU3NSw4ICszNTc1LDggQEAgc3RhdGljIHZvaWQgZ2Vu OF9pcnFfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJZ2VuOF9n dF9pcnFfcmVzZXQoZGV2X3ByaXYpOwogCi0JSTkxNV9XUklURShFRFBfUFNSX0lNUiwgMHhmZmZm ZmZmZik7Ci0JSTkxNV9XUklURShFRFBfUFNSX0lJUiwgMHhmZmZmZmZmZik7CisJaW50ZWxfdW5j b3JlX3dyaXRlKHVuY29yZSwgRURQX1BTUl9JTVIsIDB4ZmZmZmZmZmYpOworCWludGVsX3VuY29y ZV93cml0ZSh1bmNvcmUsIEVEUF9QU1JfSUlSLCAweGZmZmZmZmZmKTsKIAogCWZvcl9lYWNoX3Bp cGUoZGV2X3ByaXYsIHBpcGUpCiAJCWlmIChpbnRlbF9kaXNwbGF5X3Bvd2VyX2lzX2VuYWJsZWQo ZGV2X3ByaXYsCkBAIC0zNTkzLDIzICszNTkzLDIzIEBAIHN0YXRpYyB2b2lkIGdlbjhfaXJxX3Jl c2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHZvaWQgZ2Vu MTFfZ3RfaXJxX3Jlc2V0KHN0cnVjdCBpbnRlbF9ndCAqZ3QpCiB7Ci0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZ3QtPmk5MTU7CisJc3RydWN0IGludGVsX3VuY29yZSAqdW5j b3JlID0gZ3QtPnVuY29yZTsKIAogCS8qIERpc2FibGUgUkNTLCBCQ1MsIFZDUyBhbmQgVkVDUyBj bGFzcyBlbmdpbmVzLiAqLwotCUk5MTVfV1JJVEUoR0VOMTFfUkVOREVSX0NPUFlfSU5UUl9FTkFC TEUsIDApOwotCUk5MTVfV1JJVEUoR0VOMTFfVkNTX1ZFQ1NfSU5UUl9FTkFCTEUsCSAgMCk7CisJ aW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfUkVOREVSX0NPUFlfSU5UUl9FTkFCTEUs IDApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1ZDU19WRUNTX0lOVFJfRU5B QkxFLAkgIDApOwogCiAJLyogUmVzdG9yZSBtYXNrcyBpcnFzIG9uIFJDUywgQkNTLCBWQ1MgYW5k IFZFQ1MgZW5naW5lcy4gKi8KLQlJOTE1X1dSSVRFKEdFTjExX1JDUzBfUlNWRF9JTlRSX01BU0ss CX4wKTsKLQlJOTE1X1dSSVRFKEdFTjExX0JDU19SU1ZEX0lOVFJfTUFTSywJfjApOwotCUk5MTVf V1JJVEUoR0VOMTFfVkNTMF9WQ1MxX0lOVFJfTUFTSywJfjApOwotCUk5MTVfV1JJVEUoR0VOMTFf VkNTMl9WQ1MzX0lOVFJfTUFTSywJfjApOwotCUk5MTVfV1JJVEUoR0VOMTFfVkVDUzBfVkVDUzFf SU5UUl9NQVNLLAl+MCk7Ci0KLQlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9F TkFCTEUsIDApOwotCUk5MTVfV1JJVEUoR0VOMTFfR1BNX1dHQk9YUEVSRl9JTlRSX01BU0ssICB+ MCk7Ci0JSTkxNV9XUklURShHRU4xMV9HVUNfU0dfSU5UUl9FTkFCTEUsIDApOwotCUk5MTVfV1JJ VEUoR0VOMTFfR1VDX1NHX0lOVFJfTUFTSywgIH4wKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5j b3JlLCBHRU4xMV9SQ1MwX1JTVkRfSU5UUl9NQVNLLAl+MCk7CisJaW50ZWxfdW5jb3JlX3dyaXRl KHVuY29yZSwgR0VOMTFfQkNTX1JTVkRfSU5UUl9NQVNLLAl+MCk7CisJaW50ZWxfdW5jb3JlX3dy aXRlKHVuY29yZSwgR0VOMTFfVkNTMF9WQ1MxX0lOVFJfTUFTSywJfjApOworCWludGVsX3VuY29y ZV93cml0ZSh1bmNvcmUsIEdFTjExX1ZDUzJfVkNTM19JTlRSX01BU0ssCX4wKTsKKwlpbnRlbF91 bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9WRUNTMF9WRUNTMV9JTlRSX01BU0ssCX4wKTsKKwor CWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9FTkFC TEUsIDApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX0dQTV9XR0JPWFBFUkZf SU5UUl9NQVNLLCAgfjApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX0dVQ19T R19JTlRSX0VOQUJMRSwgMCk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfR1VD X1NHX0lOVFJfTUFTSywgIH4wKTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuMTFfaXJxX3Jlc2V0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKQEAgLTM2MjEsMTAgKzM2MjEsMTAgQEAg c3RhdGljIHZvaWQgZ2VuMTFfaXJxX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAogCWdlbjExX2d0X2lycV9yZXNldCgmZGV2X3ByaXYtPmd0KTsKIAotCUk5MTVfV1JJ VEUoR0VOMTFfRElTUExBWV9JTlRfQ1RMLCAwKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3Jl LCBHRU4xMV9ESVNQTEFZX0lOVF9DVEwsIDApOwogCi0JSTkxNV9XUklURShFRFBfUFNSX0lNUiwg MHhmZmZmZmZmZik7Ci0JSTkxNV9XUklURShFRFBfUFNSX0lJUiwgMHhmZmZmZmZmZik7CisJaW50 ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgRURQX1BTUl9JTVIsIDB4ZmZmZmZmZmYpOworCWludGVs X3VuY29yZV93cml0ZSh1bmNvcmUsIEVEUF9QU1JfSUlSLCAweGZmZmZmZmZmKTsKIAogCWZvcl9l YWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpCiAJCWlmIChpbnRlbF9kaXNwbGF5X3Bvd2VyX2lzX2Vu YWJsZWQoZGV2X3ByaXYsCkBAIC00MjI3LDIxICs0MjI3LDI0IEBAIHN0YXRpYyB2b2lkIGdlbjhf aXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3Rh dGljIHZvaWQgZ2VuMTFfZ3RfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBpbnRlbF9ndCAqZ3QpCiB7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3QtPmk5MTU7CiAJY29uc3Qg dTMyIGlycXMgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgfCBHVF9DT05URVhUX1NXSVRDSF9J TlRFUlJVUFQ7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3QtPmk5MTU7 CisJc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlID0gZ3QtPnVuY29yZTsKKwljb25zdCB1MzIg ZG1hc2sgPSBpcnFzIDw8IDE2IHwgaXJxczsKKwljb25zdCB1MzIgc21hc2sgPSBpcnFzIDw8IDE2 OwogCiAJQlVJTERfQlVHX09OKGlycXMgJiAweGZmZmYwMDAwKTsKIAogCS8qIEVuYWJsZSBSQ1Ms IEJDUywgVkNTIGFuZCBWRUNTIGNsYXNzIGludGVycnVwdHMuICovCi0JSTkxNV9XUklURShHRU4x MV9SRU5ERVJfQ09QWV9JTlRSX0VOQUJMRSwgaXJxcyA8PCAxNiB8IGlycXMpOwotCUk5MTVfV1JJ VEUoR0VOMTFfVkNTX1ZFQ1NfSU5UUl9FTkFCTEUsCSAgaXJxcyA8PCAxNiB8IGlycXMpOworCWlu dGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1JFTkRFUl9DT1BZX0lOVFJfRU5BQkxFLCBk bWFzayk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfVkNTX1ZFQ1NfSU5UUl9F TkFCTEUsIGRtYXNrKTsKIAogCS8qIFVubWFzayBpcnFzIG9uIFJDUywgQkNTLCBWQ1MgYW5kIFZF Q1MgZW5naW5lcy4gKi8KLQlJOTE1X1dSSVRFKEdFTjExX1JDUzBfUlNWRF9JTlRSX01BU0ssCX4o aXJxcyA8PCAxNikpOwotCUk5MTVfV1JJVEUoR0VOMTFfQkNTX1JTVkRfSU5UUl9NQVNLLAl+KGly cXMgPDwgMTYpKTsKLQlJOTE1X1dSSVRFKEdFTjExX1ZDUzBfVkNTMV9JTlRSX01BU0ssCX4oaXJx cyB8IGlycXMgPDwgMTYpKTsKLQlJOTE1X1dSSVRFKEdFTjExX1ZDUzJfVkNTM19JTlRSX01BU0ss CX4oaXJxcyB8IGlycXMgPDwgMTYpKTsKLQlJOTE1X1dSSVRFKEdFTjExX1ZFQ1MwX1ZFQ1MxX0lO VFJfTUFTSywJfihpcnFzIHwgaXJxcyA8PCAxNikpOworCWludGVsX3VuY29yZV93cml0ZSh1bmNv cmUsIEdFTjExX1JDUzBfUlNWRF9JTlRSX01BU0ssIH5zbWFzayk7CisJaW50ZWxfdW5jb3JlX3dy aXRlKHVuY29yZSwgR0VOMTFfQkNTX1JTVkRfSU5UUl9NQVNLLCB+c21hc2spOworCWludGVsX3Vu Y29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1ZDUzBfVkNTMV9JTlRSX01BU0ssIH5kbWFzayk7CisJ aW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfVkNTMl9WQ1MzX0lOVFJfTUFTSywgfmRt YXNrKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9WRUNTMF9WRUNTMV9JTlRS X01BU0ssIH5kbWFzayk7CiAKIAkvKgogCSAqIFJQUyBpbnRlcnJ1cHRzIHdpbGwgZ2V0IGVuYWJs ZWQvZGlzYWJsZWQgb24gZGVtYW5kIHdoZW4gUlBTIGl0c2VsZgpAQCAtNDI0OSwxMiArNDI1Miwx MiBAQCBzdGF0aWMgdm9pZCBnZW4xMV9ndF9pcnFfcG9zdGluc3RhbGwoc3RydWN0IGludGVsX2d0 ICpndCkKIAkgKi8KIAlkZXZfcHJpdi0+cG1faWVyID0gMHgwOwogCWRldl9wcml2LT5wbV9pbXIg PSB+ZGV2X3ByaXYtPnBtX2llcjsKLQlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JPWFBFUkZfSU5U Ul9FTkFCTEUsIDApOwotCUk5MTVfV1JJVEUoR0VOMTFfR1BNX1dHQk9YUEVSRl9JTlRSX01BU0ss ICB+MCk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfR1BNX1dHQk9YUEVSRl9J TlRSX0VOQUJMRSwgMCk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfR1BNX1dH Qk9YUEVSRl9JTlRSX01BU0ssICB+MCk7CiAKIAkvKiBTYW1lIHRoaW5nIGZvciBHdUMgaW50ZXJy dXB0cyAqLwotCUk5MTVfV1JJVEUoR0VOMTFfR1VDX1NHX0lOVFJfRU5BQkxFLCAwKTsKLQlJOTE1 X1dSSVRFKEdFTjExX0dVQ19TR19JTlRSX01BU0ssICB+MCk7CisJaW50ZWxfdW5jb3JlX3dyaXRl KHVuY29yZSwgR0VOMTFfR1VDX1NHX0lOVFJfRU5BQkxFLCAwKTsKKwlpbnRlbF91bmNvcmVfd3Jp dGUodW5jb3JlLCBHRU4xMV9HVUNfU0dfSU5UUl9NQVNLLCAgfjApOwogfQogCiBzdGF0aWMgdm9p ZCBpY3BfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK LS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4