From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 6/8] drm/i915: Merge sbi read/write into a single accessor Date: Fri, 26 Apr 2019 09:17:23 +0100 Message-ID: <20190426081725.31217-6-chris@chris-wilson.co.uk> References: <20190426081725.31217-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB7788923C for ; Fri, 26 Apr 2019 08:17:30 +0000 (UTC) Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 16366655-1500050 for ; Fri, 26 Apr 2019 09:17:27 +0100 In-Reply-To: <20190426081725.31217-1-chris@chris-wilson.co.uk> 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 U2luY2UgaW50ZWxfc2lkZWJhbmRfcmVhZCBhbmQgaW50ZWxfc2lkZWJhbmRfd3JpdGUgZGlmZmVy IGJ5IG9ubHkgYQpjb3VwbGUgb2YgbGluZXMgKGRlcGVuZGluZyBvbiB3aGV0aGVyIHdlIGZlZWQg dGhlIHZhbHVlIGluIG9yIG91dCksCm1lcmdlIHRoZSB0d28gaW50byBhIHNpbmdsZSBjb21tb24g YWNjZXNzb3IuCgp2MjogUmVzdG9yZSB2bHZfZmxpc2RzaV9yZWFkKCkgbG9zdCBkdXJpbmcgcmVi YXNpbmcuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2lkZWJhbmQuYyB8IDk0 ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM4IGluc2VydGlv bnMoKyksIDU2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3NpZGViYW5kLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zaWRlYmFuZC5j CmluZGV4IDVjM2FlNTE4NWEwMS4uNzExM2ZiODg1MGQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zaWRlYmFuZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3NpZGViYW5kLmMKQEAgLTI3Myw4MSArMjczLDYzIEBAIHZvaWQgdmx2X2ZsaXNkc2lfd3Jp dGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHUzMiByZWcsIHUzMiB2YWwpCiB9CiAK IC8qIFNCSSBhY2Nlc3MgKi8KLXUzMiBpbnRlbF9zYmlfcmVhZChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHUxNiByZWcsCi0JCSAgIGVudW0gaW50ZWxfc2JpX2Rlc3RpbmF0aW9u IGRlc3RpbmF0aW9uKQorc3RhdGljIGludCBpbnRlbF9zYmlfcncoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUsIHUxNiByZWcsCisJCQllbnVtIGludGVsX3NiaV9kZXN0aW5hdGlvbiBkZXN0 aW5hdGlvbiwKKwkJCXUzMiAqdmFsLCBib29sIGlzX3JlYWQpCiB7Ci0JdTMyIHZhbHVlID0gMDsK KwlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUgPSAmaTkxNS0+dW5jb3JlOworCXUzMiBjbWQ7 CiAKLQlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+c2JfbG9jayk7CisJbG9ja2RlcF9h c3NlcnRfaGVsZCgmaTkxNS0+c2JfbG9jayk7CiAKLQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0 ZXIoJmRldl9wcml2LT51bmNvcmUsCi0JCQkJICAgIFNCSV9DVExfU1RBVCwgU0JJX0JVU1ksIDAs Ci0JCQkJICAgIDEwMCkpIHsKKwlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXJfZncodW5jb3Jl LAorCQkJCSAgICAgICBTQklfQ1RMX1NUQVQsIFNCSV9CVVNZLCAwLAorCQkJCSAgICAgICAxMDAp KSB7CiAJCURSTV9FUlJPUigidGltZW91dCB3YWl0aW5nIGZvciBTQkkgdG8gYmVjb21lIHJlYWR5 XG4iKTsKLQkJcmV0dXJuIDA7CisJCXJldHVybiAtRUJVU1k7CiAJfQogCi0JSTkxNV9XUklURShT QklfQUREUiwgKHJlZyA8PCAxNikpOwotCUk5MTVfV1JJVEUoU0JJX0RBVEEsIDApOworCWludGVs X3VuY29yZV93cml0ZV9mdyh1bmNvcmUsIFNCSV9BRERSLCAodTMyKXJlZyA8PCAxNik7CisJaW50 ZWxfdW5jb3JlX3dyaXRlX2Z3KHVuY29yZSwgU0JJX0RBVEEsIGlzX3JlYWQgPyAwIDogKnZhbCk7 CiAKIAlpZiAoZGVzdGluYXRpb24gPT0gU0JJX0lDTEspCi0JCXZhbHVlID0gU0JJX0NUTF9ERVNU X0lDTEsgfCBTQklfQ1RMX09QX0NSUkQ7CisJCWNtZCA9IFNCSV9DVExfREVTVF9JQ0xLIHwgU0JJ X0NUTF9PUF9DUlJEOwogCWVsc2UKLQkJdmFsdWUgPSBTQklfQ1RMX0RFU1RfTVBIWSB8IFNCSV9D VExfT1BfSU9SRDsKLQlJOTE1X1dSSVRFKFNCSV9DVExfU1RBVCwgdmFsdWUgfCBTQklfQlVTWSk7 Ci0KLQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoJmRldl9wcml2LT51bmNvcmUsCi0JCQkJ ICAgIFNCSV9DVExfU1RBVCwKLQkJCQkgICAgU0JJX0JVU1ksCi0JCQkJICAgIDAsCi0JCQkJICAg IDEwMCkpIHsKKwkJY21kID0gU0JJX0NUTF9ERVNUX01QSFkgfCBTQklfQ1RMX09QX0lPUkQ7CisJ aWYgKCFpc19yZWFkKQorCQljbWQgfD0gQklUKDgpOworCWludGVsX3VuY29yZV93cml0ZV9mdyh1 bmNvcmUsIFNCSV9DVExfU1RBVCwgY21kIHwgU0JJX0JVU1kpOworCisJaWYgKF9faW50ZWxfd2Fp dF9mb3JfcmVnaXN0ZXJfZncodW5jb3JlLAorCQkJCQkgU0JJX0NUTF9TVEFULCBTQklfQlVTWSwg MCwKKwkJCQkJIDEwMCwgMTAwLCAmY21kKSkgewogCQlEUk1fRVJST1IoInRpbWVvdXQgd2FpdGlu ZyBmb3IgU0JJIHRvIGNvbXBsZXRlIHJlYWRcbiIpOwotCQlyZXR1cm4gMDsKKwkJcmV0dXJuIC1F VElNRURPVVQ7CiAJfQogCi0JaWYgKEk5MTVfUkVBRChTQklfQ1RMX1NUQVQpICYgU0JJX1JFU1BP TlNFX0ZBSUwpIHsKKwlpZiAoY21kICYgU0JJX1JFU1BPTlNFX0ZBSUwpIHsKIAkJRFJNX0VSUk9S KCJlcnJvciBkdXJpbmcgU0JJIHJlYWQgb2YgcmVnICV4XG4iLCByZWcpOwotCQlyZXR1cm4gMDsK KwkJcmV0dXJuIC1FTlhJTzsKIAl9CiAKLQlyZXR1cm4gSTkxNV9SRUFEKFNCSV9EQVRBKTsKKwlp ZiAoaXNfcmVhZCkKKwkJKnZhbCA9IGludGVsX3VuY29yZV9yZWFkX2Z3KHVuY29yZSwgU0JJX0RB VEEpOworCisJcmV0dXJuIDA7CiB9CiAKLXZvaWQgaW50ZWxfc2JpX3dyaXRlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTE2IHJlZywgdTMyIHZhbHVlLAotCQkgICAgIGVudW0g aW50ZWxfc2JpX2Rlc3RpbmF0aW9uIGRlc3RpbmF0aW9uKQordTMyIGludGVsX3NiaV9yZWFkKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCB1MTYgcmVnLAorCQkgICBlbnVtIGludGVsX3Ni aV9kZXN0aW5hdGlvbiBkZXN0aW5hdGlvbikKIHsKLQl1MzIgdG1wOworCXUzMiByZXN1bHQgPSAw OwogCi0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPnNiX2xvY2spOworCWludGVsX3Ni aV9ydyhpOTE1LCByZWcsIGRlc3RpbmF0aW9uLCAmcmVzdWx0LCB0cnVlKTsKIAotCWlmIChpbnRl bF93YWl0X2Zvcl9yZWdpc3RlcigmZGV2X3ByaXYtPnVuY29yZSwKLQkJCQkgICAgU0JJX0NUTF9T VEFULCBTQklfQlVTWSwgMCwKLQkJCQkgICAgMTAwKSkgewotCQlEUk1fRVJST1IoInRpbWVvdXQg d2FpdGluZyBmb3IgU0JJIHRvIGJlY29tZSByZWFkeVxuIik7Ci0JCXJldHVybjsKLQl9Ci0KLQlJ OTE1X1dSSVRFKFNCSV9BRERSLCAocmVnIDw8IDE2KSk7Ci0JSTkxNV9XUklURShTQklfREFUQSwg dmFsdWUpOwotCi0JaWYgKGRlc3RpbmF0aW9uID09IFNCSV9JQ0xLKQotCQl0bXAgPSBTQklfQ1RM X0RFU1RfSUNMSyB8IFNCSV9DVExfT1BfQ1JXUjsKLQllbHNlCi0JCXRtcCA9IFNCSV9DVExfREVT VF9NUEhZIHwgU0JJX0NUTF9PUF9JT1dSOwotCUk5MTVfV1JJVEUoU0JJX0NUTF9TVEFULCBTQklf QlVTWSB8IHRtcCk7Ci0KLQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoJmRldl9wcml2LT51 bmNvcmUsCi0JCQkJICAgIFNCSV9DVExfU1RBVCwKLQkJCQkgICAgU0JJX0JVU1ksCi0JCQkJICAg IDAsCi0JCQkJICAgIDEwMCkpIHsKLQkJRFJNX0VSUk9SKCJ0aW1lb3V0IHdhaXRpbmcgZm9yIFNC SSB0byBjb21wbGV0ZSB3cml0ZVxuIik7Ci0JCXJldHVybjsKLQl9CisJcmV0dXJuIHJlc3VsdDsK K30KIAotCWlmIChJOTE1X1JFQUQoU0JJX0NUTF9TVEFUKSAmIFNCSV9SRVNQT05TRV9GQUlMKSB7 Ci0JCURSTV9FUlJPUigiZXJyb3IgZHVyaW5nIFNCSSB3cml0ZSBvZiAleCB0byByZWcgJXhcbiIs Ci0JCQkgIHZhbHVlLCByZWcpOwotCQlyZXR1cm47Ci0JfQordm9pZCBpbnRlbF9zYmlfd3JpdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHUxNiByZWcsIHUzMiB2YWx1ZSwKKwkJICAg ICBlbnVtIGludGVsX3NiaV9kZXN0aW5hdGlvbiBkZXN0aW5hdGlvbikKK3sKKwlpbnRlbF9zYmlf cncoaTkxNSwgcmVnLCBkZXN0aW5hdGlvbiwgJnZhbHVlLCBmYWxzZSk7CiB9Ci0tIAoyLjIwLjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==