From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 06/21] drm/i915: Convert some more bits to use engine mmio accessors Date: Thu, 6 Jun 2019 10:36:24 +0100 Message-ID: <20190606093639.9372-7-tvrtko.ursulin@linux.intel.com> References: <20190606093639.9372-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA45A89471 for ; Thu, 6 Jun 2019 09:36:55 +0000 (UTC) In-Reply-To: <20190606093639.9372-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlbW92ZSBh IGNvdXBsZSBkZXZfcHJpdiBsb2NhbHMgYXMgYSBjb25zZXF1ZW5jZS4KClNpZ25lZC1vZmYtYnk6 IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvZ3QvaW50ZWxfbHJjLmMgICAgICAgICB8IDI3ICsrKysrKysrKystLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgICAgICB8ICA1ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICAgICAgfCAgMiArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgICAgICAgICB8ICAyICstCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIHwgIDQgKy0tCiA1IGZpbGVz IGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ3QvaW50ZWxfbHJjLmMKaW5kZXggZmVkNzA0ODAyYzU3Li5mMjdiNmMwMDI2MjcgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2d0L2ludGVsX2xyYy5jCkBAIC0yMDIxLDMxICsyMDIxLDMwIEBAIHN0YXRp YyBpbnQgaW50ZWxfaW5pdF93b3JrYXJvdW5kX2JiKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAogc3RhdGljIHZvaWQgZW5hYmxlX2V4ZWNsaXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5n aW5lLT5pOTE1OwotCiAJaW50ZWxfZW5naW5lX3NldF9od3NwX3dyaXRlbWFzayhlbmdpbmUsIH4w dSk7IC8qIEhXU1RBTSAqLwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCi0JCUk5 MTVfV1JJVEUoUklOR19NT0RFX0dFTjcoZW5naW5lKSwKLQkJCSAgIF9NQVNLRURfQklUX0VOQUJM RShHRU4xMV9HRlhfRElTQUJMRV9MRUdBQ1lfTU9ERSkpOworCWlmIChJTlRFTF9HRU4oZW5naW5l LT5pOTE1KSA+PSAxMSkKKwkJRU5HSU5FX1dSSVRFKGVuZ2luZSwKKwkJCSAgICAgUklOR19NT0RF X0dFTjcsCisJCQkgICAgIF9NQVNLRURfQklUX0VOQUJMRShHRU4xMV9HRlhfRElTQUJMRV9MRUdB Q1lfTU9ERSkpOwogCWVsc2UKLQkJSTkxNV9XUklURShSSU5HX01PREVfR0VONyhlbmdpbmUpLAot CQkJICAgX01BU0tFRF9CSVRfRU5BQkxFKEdGWF9SVU5fTElTVF9FTkFCTEUpKTsKKwkJRU5HSU5F X1dSSVRFKGVuZ2luZSwKKwkJCSAgICAgUklOR19NT0RFX0dFTjcsCisJCQkgICAgIF9NQVNLRURf QklUX0VOQUJMRShHRlhfUlVOX0xJU1RfRU5BQkxFKSk7CiAKLQlJOTE1X1dSSVRFKFJJTkdfTUlf TU9ERShlbmdpbmUtPm1taW9fYmFzZSksCi0JCSAgIF9NQVNLRURfQklUX0RJU0FCTEUoU1RPUF9S SU5HKSk7CisJRU5HSU5FX1dSSVRFKGVuZ2luZSwgUklOR19NSV9NT0RFLCBfTUFTS0VEX0JJVF9E SVNBQkxFKFNUT1BfUklORykpOwogCi0JSTkxNV9XUklURShSSU5HX0hXU19QR0EoZW5naW5lLT5t bWlvX2Jhc2UpLAotCQkgICBpOTE1X2dndHRfb2Zmc2V0KGVuZ2luZS0+c3RhdHVzX3BhZ2Uudm1h KSk7Ci0JUE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShlbmdpbmUtPm1taW9fYmFzZSkpOworCUVO R0lORV9XUklURShlbmdpbmUsCisJCSAgICAgUklOR19IV1NfUEdBLAorCQkgICAgIGk5MTVfZ2d0 dF9vZmZzZXQoZW5naW5lLT5zdGF0dXNfcGFnZS52bWEpKTsKKwlFTkdJTkVfUE9TVElOR19SRUFE KGVuZ2luZSwgUklOR19IV1NfUEdBKTsKIH0KIAogc3RhdGljIGJvb2wgdW5leHBlY3RlZF9zdGFy dGluZ19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCWJvb2wgdW5leHBlY3Rl ZCA9IGZhbHNlOwogCi0JaWYgKEk5MTVfUkVBRChSSU5HX01JX01PREUoZW5naW5lLT5tbWlvX2Jh c2UpKSAmIFNUT1BfUklORykgeworCWlmIChFTkdJTkVfUkVBRChlbmdpbmUsIFJJTkdfTUlfTU9E RSkgJiBTVE9QX1JJTkcpIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiU1RPUF9SSU5HIHN0aWxsIHNl dCBpbiBSSU5HX01JX01PREVcbiIpOwogCQl1bmV4cGVjdGVkID0gdHJ1ZTsKIAl9CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDBmZTU2OGNmYWJlMC4uM2JhOTcwZjJkYjI4IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMTcxMyw4ICsxNzEzLDkgQEAgc3Rh dGljIHZvaWQgZ2VuN19wcGd0dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CiAJCS8qIEdG WF9NT0RFIGlzIHBlci1yaW5nIG9uIGdlbjcrICovCi0JCUk5MTVfV1JJVEUoUklOR19NT0RFX0dF TjcoZW5naW5lKSwKLQkJCSAgIF9NQVNLRURfQklUX0VOQUJMRShHRlhfUFBHVFRfRU5BQkxFKSk7 CisJCUVOR0lORV9XUklURShlbmdpbmUsCisJCQkgICAgIFJJTkdfTU9ERV9HRU43LAorCQkJICAg ICBfTUFTS0VEX0JJVF9FTkFCTEUoR0ZYX1BQR1RUX0VOQUJMRSkpOwogCX0KIH0KIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggMmY4NWRlMDM0ZDhmLi4xOTNhOTM4NTdk OTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMTIxOSw3ICsxMjE5 LDcgQEAgc3RhdGljIHZvaWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9yZWdpc3RlcnMoc3RydWN0IGk5 MTVfZ3B1X3N0YXRlICplcnJvciwKIAlpZiAoSEFTX1BQR1RUKGRldl9wcml2KSkgewogCQlpbnQg aTsKIAotCQllZS0+dm1faW5mby5nZnhfbW9kZSA9IEk5MTVfUkVBRChSSU5HX01PREVfR0VONyhl bmdpbmUpKTsKKwkJZWUtPnZtX2luZm8uZ2Z4X21vZGUgPSBFTkdJTkVfUkVBRChlbmdpbmUsIFJJ TkdfTU9ERV9HRU43KTsKIAogCQlpZiAoSVNfR0VOKGRldl9wcml2LCA2KSkgewogCQkJZWUtPnZt X2luZm8ucHBfZGlyX2Jhc2UgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMWI5YWU0OGQx YWJlLi44YThiMzRhMTNkMmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMjY5OCw3ICsy Njk4LDcgQEAgZW51bSBpOTE1X3Bvd2VyX3dlbGxfaWQgewogCiAjZGVmaW5lIEdGWF9NT0RFCV9N TUlPKDB4MjUyMCkKICNkZWZpbmUgR0ZYX01PREVfR0VONwlfTU1JTygweDIyOWMpCi0jZGVmaW5l IFJJTkdfTU9ERV9HRU43KGVuZ2luZSkJX01NSU8oKGVuZ2luZSktPm1taW9fYmFzZSArIDB4Mjlj KQorI2RlZmluZSBSSU5HX01PREVfR0VONyhiYXNlKQlfTU1JTygoYmFzZSkgKyAweDI5YykKICNk ZWZpbmUgICBHRlhfUlVOX0xJU1RfRU5BQkxFCQkoMSA8PCAxNSkKICNkZWZpbmUgICBHRlhfSU5U RVJSVVBUX1NURUVSSU5HCSgxIDw8IDE0KQogI2RlZmluZSAgIEdGWF9UTEJfSU5WQUxJREFURV9F WFBMSUNJVAkoMSA8PCAxMykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlz c2lvbi5jCmluZGV4IGE0Zjk4Y2NlZjBmZS4uODk1OTJlZjc3OGI4IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKQEAgLTEzMDYsNyArMTMwNiw3IEBAIHN0 YXRpYyB2b2lkIGd1Y19pbnRlcnJ1cHRzX2NhcHR1cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCSAqLwogCWlycXMgPSBfTUFTS0VEX0JJVF9FTkFCTEUoR0ZYX0lOVEVSUlVQ VF9TVEVFUklORyk7CiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKQotCQlJ OTE1X1dSSVRFKFJJTkdfTU9ERV9HRU43KGVuZ2luZSksIGlycXMpOworCQlFTkdJTkVfV1JJVEUo ZW5naW5lLCBSSU5HX01PREVfR0VONywgaXJxcyk7CiAKIAkvKiByb3V0ZSBVU0VSX0lOVEVSUlVQ VCB0byBIb3N0LCBhbGwgb3RoZXJzIGFyZSBzZW50IHRvIEd1Qy4gKi8KIAlpcnFzID0gR1RfUkVO REVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfUkNTX0lSUV9TSElGVCB8CkBAIC0xMzUzLDcgKzEz NTMsNyBAQCBzdGF0aWMgdm9pZCBndWNfaW50ZXJydXB0c19yZWxlYXNlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAlpcnFzID0gX01BU0tFRF9GSUVMRChHRlhfRk9SV0FSRF9W QkxBTktfTUFTSywgR0ZYX0ZPUldBUkRfVkJMQU5LX05FVkVSKTsKIAlpcnFzIHw9IF9NQVNLRURf QklUX0RJU0FCTEUoR0ZYX0lOVEVSUlVQVF9TVEVFUklORyk7CiAJZm9yX2VhY2hfZW5naW5lKGVu Z2luZSwgZGV2X3ByaXYsIGlkKQotCQlJOTE1X1dSSVRFKFJJTkdfTU9ERV9HRU43KGVuZ2luZSks IGlycXMpOworCQlFTkdJTkVfV1JJVEUoZW5naW5lLCBSSU5HX01PREVfR0VONywgaXJxcyk7CiAK IAkvKiByb3V0ZSBhbGwgR1QgaW50ZXJydXB0cyB0byB0aGUgaG9zdCAqLwogCUk5MTVfV1JJVEUo R1VDX0JDU19SQ1NfSUVSLCAwKTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4