From: Tvrtko Ursulin Subject: [CI 2/3] drm/i915: Remove some legacy mmio accessors from interrupt handling Date: Thu, 4 Jul 2019 13:17:55 +0100 Message-ID: <20190704121756.27824-2-tvrtko.ursulin@linux.intel.com> References: <20190704121756.27824-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F1366E331 for ; Thu, 4 Jul 2019 12:17:59 +0000 (UTC) In-Reply-To: <20190704121756.27824-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vc3RseSBp biBnZW4xMSBpbnRlcnJ1cHQgaGFuZGxpbmcgYW5kIGEgY291cGxlIG5laWdoYm91cmluZyBmdW5j dGlvbnMKd2hpY2ggd2VyZSBlYXN5IHNpbmNlIHVuY29yZSBsb2NhbCB3YXMgYWxyZWFkeSBhdmFp bGFibGUuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVs LmNvbT4KQ28tZGV2ZWxvcGVkLWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVs LmNvbT4KQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0Bp bnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KQWNrZWQtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3Nw dXJpb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8IDc1 ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM5IGlu c2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4 IGNiOWNjOWNlYWMyZS4uMDlkZjdlNjE4MTVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAg LTM0NzksMTIgKzM0NzksMTIgQEAgc3RhdGljIHZvaWQgdmx2X2Rpc3BsYXlfaXJxX3Jlc2V0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1 bmNvcmUgPSAmZGV2X3ByaXYtPnVuY29yZTsKIAogCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2 KSkKLQkJSTkxNV9XUklURShEUElOVkdUVCwgRFBJTlZHVFRfU1RBVFVTX01BU0tfQ0hWKTsKKwkJ aW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgRFBJTlZHVFQsIERQSU5WR1RUX1NUQVRVU19NQVNL X0NIVik7CiAJZWxzZQotCQlJOTE1X1dSSVRFKERQSU5WR1RULCBEUElOVkdUVF9TVEFUVVNfTUFT Syk7CisJCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIERQSU5WR1RULCBEUElOVkdUVF9TVEFU VVNfTUFTSyk7CiAKIAlpOTE1X2hvdHBsdWdfaW50ZXJydXB0X3VwZGF0ZV9sb2NrZWQoZGV2X3By aXYsIDB4ZmZmZmZmZmYsIDApOwotCUk5MTVfV1JJVEUoUE9SVF9IT1RQTFVHX1NUQVQsIEk5MTVf UkVBRChQT1JUX0hPVFBMVUdfU1RBVCkpOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIFBP UlRfSE9UUExVR19TVEFULCBJOTE1X1JFQUQoUE9SVF9IT1RQTFVHX1NUQVQpKTsKIAogCWk5eHhf cGlwZXN0YXRfaXJxX3Jlc2V0KGRldl9wcml2KTsKIApAQCAtMzUzMSwxMSArMzUzMSwxMSBAQCBz dGF0aWMgdm9pZCBpcm9ubGFrZV9pcnFfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCiAJR0VOM19JUlFfUkVTRVQodW5jb3JlLCBERSk7CiAJaWYgKElTX0dFTihkZXZf cHJpdiwgNykpCi0JCUk5MTVfV1JJVEUoR0VON19FUlJfSU5ULCAweGZmZmZmZmZmKTsKKwkJaW50 ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VON19FUlJfSU5ULCAweGZmZmZmZmZmKTsKIAogCWlm IChJU19IQVNXRUxMKGRldl9wcml2KSkgewotCQlJOTE1X1dSSVRFKEVEUF9QU1JfSU1SLCAweGZm ZmZmZmZmKTsKLQkJSTkxNV9XUklURShFRFBfUFNSX0lJUiwgMHhmZmZmZmZmZik7CisJCWludGVs X3VuY29yZV93cml0ZSh1bmNvcmUsIEVEUF9QU1JfSU1SLCAweGZmZmZmZmZmKTsKKwkJaW50ZWxf dW5jb3JlX3dyaXRlKHVuY29yZSwgRURQX1BTUl9JSVIsIDB4ZmZmZmZmZmYpOwogCX0KIAogCWdl bjVfZ3RfaXJxX3Jlc2V0KGRldl9wcml2KTsKQEAgLTM1NzUsOCArMzU3NSw4IEBAIHN0YXRpYyB2 b2lkIGdlbjhfaXJxX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAog CWdlbjhfZ3RfaXJxX3Jlc2V0KGRldl9wcml2KTsKIAotCUk5MTVfV1JJVEUoRURQX1BTUl9JTVIs IDB4ZmZmZmZmZmYpOwotCUk5MTVfV1JJVEUoRURQX1BTUl9JSVIsIDB4ZmZmZmZmZmYpOworCWlu dGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEVEUF9QU1JfSU1SLCAweGZmZmZmZmZmKTsKKwlpbnRl bF91bmNvcmVfd3JpdGUodW5jb3JlLCBFRFBfUFNSX0lJUiwgMHhmZmZmZmZmZik7CiAKIAlmb3Jf ZWFjaF9waXBlKGRldl9wcml2LCBwaXBlKQogCQlpZiAoaW50ZWxfZGlzcGxheV9wb3dlcl9pc19l bmFibGVkKGRldl9wcml2LApAQCAtMzU5MywyMyArMzU5MywyMyBAQCBzdGF0aWMgdm9pZCBnZW44 X2lycV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB2 b2lkIGdlbjExX2d0X2lycV9yZXNldChzdHJ1Y3QgaW50ZWxfZ3QgKmd0KQogewotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd0LT5pOTE1OworCXN0cnVjdCBpbnRlbF91bmNv cmUgKnVuY29yZSA9IGd0LT51bmNvcmU7CiAKIAkvKiBEaXNhYmxlIFJDUywgQkNTLCBWQ1MgYW5k IFZFQ1MgY2xhc3MgZW5naW5lcy4gKi8KLQlJOTE1X1dSSVRFKEdFTjExX1JFTkRFUl9DT1BZX0lO VFJfRU5BQkxFLCAwKTsKLQlJOTE1X1dSSVRFKEdFTjExX1ZDU19WRUNTX0lOVFJfRU5BQkxFLAkg IDApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1JFTkRFUl9DT1BZX0lOVFJf RU5BQkxFLCAwKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9WQ1NfVkVDU19J TlRSX0VOQUJMRSwJICAwKTsKIAogCS8qIFJlc3RvcmUgbWFza3MgaXJxcyBvbiBSQ1MsIEJDUywg VkNTIGFuZCBWRUNTIGVuZ2luZXMuICovCi0JSTkxNV9XUklURShHRU4xMV9SQ1MwX1JTVkRfSU5U Ul9NQVNLLAl+MCk7Ci0JSTkxNV9XUklURShHRU4xMV9CQ1NfUlNWRF9JTlRSX01BU0ssCX4wKTsK LQlJOTE1X1dSSVRFKEdFTjExX1ZDUzBfVkNTMV9JTlRSX01BU0ssCX4wKTsKLQlJOTE1X1dSSVRF KEdFTjExX1ZDUzJfVkNTM19JTlRSX01BU0ssCX4wKTsKLQlJOTE1X1dSSVRFKEdFTjExX1ZFQ1Mw X1ZFQ1MxX0lOVFJfTUFTSywJfjApOwotCi0JSTkxNV9XUklURShHRU4xMV9HUE1fV0dCT1hQRVJG X0lOVFJfRU5BQkxFLCAwKTsKLQlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9N QVNLLCAgfjApOwotCUk5MTVfV1JJVEUoR0VOMTFfR1VDX1NHX0lOVFJfRU5BQkxFLCAwKTsKLQlJ OTE1X1dSSVRFKEdFTjExX0dVQ19TR19JTlRSX01BU0ssICB+MCk7CisJaW50ZWxfdW5jb3JlX3dy aXRlKHVuY29yZSwgR0VOMTFfUkNTMF9SU1ZEX0lOVFJfTUFTSywJfjApOworCWludGVsX3VuY29y ZV93cml0ZSh1bmNvcmUsIEdFTjExX0JDU19SU1ZEX0lOVFJfTUFTSywJfjApOworCWludGVsX3Vu Y29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1ZDUzBfVkNTMV9JTlRSX01BU0ssCX4wKTsKKwlpbnRl bF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9WQ1MyX1ZDUzNfSU5UUl9NQVNLLAl+MCk7CisJ aW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfVkVDUzBfVkVDUzFfSU5UUl9NQVNLLAl+ MCk7CisKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9HUE1fV0dCT1hQRVJGX0lO VFJfRU5BQkxFLCAwKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9HUE1fV0dC T1hQRVJGX0lOVFJfTUFTSywgIH4wKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4x MV9HVUNfU0dfSU5UUl9FTkFCTEUsIDApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdF TjExX0dVQ19TR19JTlRSX01BU0ssICB+MCk7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjExX2lycV9y ZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0zNjIxLDEwICszNjIx LDEwIEBAIHN0YXRpYyB2b2lkIGdlbjExX2lycV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAKIAlnZW4xMV9ndF9pcnFfcmVzZXQoJmRldl9wcml2LT5ndCk7CiAKLQlJ OTE1X1dSSVRFKEdFTjExX0RJU1BMQVlfSU5UX0NUTCwgMCk7CisJaW50ZWxfdW5jb3JlX3dyaXRl KHVuY29yZSwgR0VOMTFfRElTUExBWV9JTlRfQ1RMLCAwKTsKIAotCUk5MTVfV1JJVEUoRURQX1BT Ul9JTVIsIDB4ZmZmZmZmZmYpOwotCUk5MTVfV1JJVEUoRURQX1BTUl9JSVIsIDB4ZmZmZmZmZmYp OworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEVEUF9QU1JfSU1SLCAweGZmZmZmZmZmKTsK KwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBFRFBfUFNSX0lJUiwgMHhmZmZmZmZmZik7CiAK IAlmb3JfZWFjaF9waXBlKGRldl9wcml2LCBwaXBlKQogCQlpZiAoaW50ZWxfZGlzcGxheV9wb3dl cl9pc19lbmFibGVkKGRldl9wcml2LApAQCAtNDIyNywyMSArNDIyNywyNCBAQCBzdGF0aWMgdm9p ZCBnZW44X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAKIHN0YXRpYyB2b2lkIGdlbjExX2d0X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgaW50ZWxfZ3Qg Kmd0KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd0LT5pOTE1Owog CWNvbnN0IHUzMiBpcnFzID0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIHwgR1RfQ09OVEVYVF9T V0lUQ0hfSU5URVJSVVBUOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd0 LT5pOTE1OworCXN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51bmNvcmU7CisJY29u c3QgdTMyIGRtYXNrID0gaXJxcyA8PCAxNiB8IGlycXM7CisJY29uc3QgdTMyIHNtYXNrID0gaXJx cyA8PCAxNjsKIAogCUJVSUxEX0JVR19PTihpcnFzICYgMHhmZmZmMDAwMCk7CiAKIAkvKiBFbmFi bGUgUkNTLCBCQ1MsIFZDUyBhbmQgVkVDUyBjbGFzcyBpbnRlcnJ1cHRzLiAqLwotCUk5MTVfV1JJ VEUoR0VOMTFfUkVOREVSX0NPUFlfSU5UUl9FTkFCTEUsIGlycXMgPDwgMTYgfCBpcnFzKTsKLQlJ OTE1X1dSSVRFKEdFTjExX1ZDU19WRUNTX0lOVFJfRU5BQkxFLAkgIGlycXMgPDwgMTYgfCBpcnFz KTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9SRU5ERVJfQ09QWV9JTlRSX0VO QUJMRSwgZG1hc2spOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1ZDU19WRUNT X0lOVFJfRU5BQkxFLCBkbWFzayk7CiAKIAkvKiBVbm1hc2sgaXJxcyBvbiBSQ1MsIEJDUywgVkNT IGFuZCBWRUNTIGVuZ2luZXMuICovCi0JSTkxNV9XUklURShHRU4xMV9SQ1MwX1JTVkRfSU5UUl9N QVNLLAl+KGlycXMgPDwgMTYpKTsKLQlJOTE1X1dSSVRFKEdFTjExX0JDU19SU1ZEX0lOVFJfTUFT SywJfihpcnFzIDw8IDE2KSk7Ci0JSTkxNV9XUklURShHRU4xMV9WQ1MwX1ZDUzFfSU5UUl9NQVNL LAl+KGlycXMgfCBpcnFzIDw8IDE2KSk7Ci0JSTkxNV9XUklURShHRU4xMV9WQ1MyX1ZDUzNfSU5U Ul9NQVNLLAl+KGlycXMgfCBpcnFzIDw8IDE2KSk7Ci0JSTkxNV9XUklURShHRU4xMV9WRUNTMF9W RUNTMV9JTlRSX01BU0ssCX4oaXJxcyB8IGlycXMgPDwgMTYpKTsKKwlpbnRlbF91bmNvcmVfd3Jp dGUodW5jb3JlLCBHRU4xMV9SQ1MwX1JTVkRfSU5UUl9NQVNLLCB+c21hc2spOworCWludGVsX3Vu Y29yZV93cml0ZSh1bmNvcmUsIEdFTjExX0JDU19SU1ZEX0lOVFJfTUFTSywgfnNtYXNrKTsKKwlp bnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCBHRU4xMV9WQ1MwX1ZDUzFfSU5UUl9NQVNLLCB+ZG1h c2spOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX1ZDUzJfVkNTM19JTlRSX01B U0ssIH5kbWFzayk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfVkVDUzBfVkVD UzFfSU5UUl9NQVNLLCB+ZG1hc2spOwogCiAJLyoKIAkgKiBSUFMgaW50ZXJydXB0cyB3aWxsIGdl dCBlbmFibGVkL2Rpc2FibGVkIG9uIGRlbWFuZCB3aGVuIFJQUyBpdHNlbGYKQEAgLTQyNDksMTIg KzQyNTIsMTIgQEAgc3RhdGljIHZvaWQgZ2VuMTFfZ3RfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBp bnRlbF9ndCAqZ3QpCiAJICovCiAJZGV2X3ByaXYtPnBtX2llciA9IDB4MDsKIAlkZXZfcHJpdi0+ cG1faW1yID0gfmRldl9wcml2LT5wbV9pZXI7Ci0JSTkxNV9XUklURShHRU4xMV9HUE1fV0dCT1hQ RVJGX0lOVFJfRU5BQkxFLCAwKTsKLQlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JPWFBFUkZfSU5U Ul9NQVNLLCAgfjApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX0dQTV9XR0JP WFBFUkZfSU5UUl9FTkFCTEUsIDApOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjEx X0dQTV9XR0JPWFBFUkZfSU5UUl9NQVNLLCAgfjApOwogCiAJLyogU2FtZSB0aGluZyBmb3IgR3VD IGludGVycnVwdHMgKi8KLQlJOTE1X1dSSVRFKEdFTjExX0dVQ19TR19JTlRSX0VOQUJMRSwgMCk7 Ci0JSTkxNV9XUklURShHRU4xMV9HVUNfU0dfSU5UUl9NQVNLLCAgfjApOworCWludGVsX3VuY29y ZV93cml0ZSh1bmNvcmUsIEdFTjExX0dVQ19TR19JTlRSX0VOQUJMRSwgMCk7CisJaW50ZWxfdW5j b3JlX3dyaXRlKHVuY29yZSwgR0VOMTFfR1VDX1NHX0lOVFJfTUFTSywgIH4wKTsKIH0KIAogc3Rh dGljIHZvaWQgaWNwX2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeA==