From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 17/21] drm/i915: Consolidate some open coded mmio rmw Date: Thu, 6 Jun 2019 10:36:35 +0100 Message-ID: <20190606093639.9372-18-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 9E18D89471 for ; Thu, 6 Jun 2019 09:37:11 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlcGxhY2Ug c29tZSBnZW42Lzcgb3BlbiBjb2RlZCBybXcgd2l0aCBpbnRlbF91bmNvcmVfcm13LgoKU2lnbmVk LW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDQyICsrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBiMmMyZGM5OWJmOGEu LmZlOWNkNGVhOTY3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE2OTcs MTMgKzE2OTcsMTAgQEAgc3RhdGljIHZvaWQgZ2VuN19wcGd0dF9lbmFibGUoc3RydWN0IGludGVs X3VuY29yZSAqdW5jb3JlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gdW5j b3JlX3RvX2k5MTUodW5jb3JlKTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0J dTMyIGVjb2NoaywgZWNvYml0czsKIAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKwl1MzIgZWNv Y2hrOwogCi0JZWNvYml0cyA9IGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgR0FDX0VDT19CSVRT KTsKLQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAotCQkJICAgR0FDX0VDT19CSVRTLAotCQkJ ICAgZWNvYml0cyB8IEVDT0JJVFNfUFBHVFRfQ0FDSEU2NEIpOworCWludGVsX3VuY29yZV9ybXco dW5jb3JlLCBHQUNfRUNPX0JJVFMsIDAsIEVDT0JJVFNfUFBHVFRfQ0FDSEU2NEIpOwogCiAJZWNv Y2hrID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBHQU1fRUNPQ0hLKTsKIAlpZiAoSVNfSEFT V0VMTChpOTE1KSkgewpAQCAtMTcyNCwyMiArMTcyMSwyMCBAQCBzdGF0aWMgdm9pZCBnZW43X3Bw Z3R0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpCiAKIHN0YXRpYyB2b2lkIGdl bjZfcHBndHRfZW5hYmxlKHN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSkKIHsKLQl1MzIgZWNv Y2hrLCBnYWJfY3RsLCBlY29iaXRzOworCWludGVsX3VuY29yZV9ybXcodW5jb3JlLAorCQkJIEdB Q19FQ09fQklUUywKKwkJCSAwLAorCQkJIEVDT0JJVFNfU05CX0JJVCB8IEVDT0JJVFNfUFBHVFRf Q0FDSEU2NEIpOwogCi0JZWNvYml0cyA9IGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgR0FDX0VD T19CSVRTKTsKLQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAotCQkJICAgR0FDX0VDT19CSVRT LAotCQkJICAgZWNvYml0cyB8IEVDT0JJVFNfU05CX0JJVCB8IEVDT0JJVFNfUFBHVFRfQ0FDSEU2 NEIpOworCWludGVsX3VuY29yZV9ybXcodW5jb3JlLAorCQkJIEdBQl9DVEwsCisJCQkgMCwKKwkJ CSBHQUJfQ1RMX0NPTlRfQUZURVJfUEFHRUZBVUxUKTsKIAotCWdhYl9jdGwgPSBpbnRlbF91bmNv cmVfcmVhZCh1bmNvcmUsIEdBQl9DVEwpOwotCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCi0J CQkgICBHQUJfQ1RMLAotCQkJICAgZ2FiX2N0bCB8IEdBQl9DVExfQ09OVF9BRlRFUl9QQUdFRkFV TFQpOwotCi0JZWNvY2hrID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBHQU1fRUNPQ0hLKTsK LQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAotCQkJICAgR0FNX0VDT0NISywKLQkJCSAgIGVj b2NoayB8IEVDT0NIS19TTkJfQklUIHwgRUNPQ0hLX1BQR1RUX0NBQ0hFNjRCKTsKKwlpbnRlbF91 bmNvcmVfcm13KHVuY29yZSwKKwkJCSBHQU1fRUNPQ0hLLAorCQkJIDAsCisJCQkgRUNPQ0hLX1NO Ql9CSVQgfCBFQ09DSEtfUFBHVFRfQ0FDSEU2NEIpOwogCiAJaWYgKEhBU19QUEdUVCh1bmNvcmVf dG9faTkxNSh1bmNvcmUpKSkgLyogbWF5IGJlIGRpc2FibGVkIGZvciBWVC1kICovCiAJCWludGVs X3VuY29yZV93cml0ZSh1bmNvcmUsCkBAIC0yMjM0LDExICsyMjI5LDEwIEBAIHN0YXRpYyB2b2lk IGd0dF93cml0ZV93b3JrYXJvdW5kcyhzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpCiAJICov CiAJaWYgKEhBU19QQUdFX1NJWkVTKGk5MTUsIEk5MTVfR1RUX1BBR0VfU0laRV82NEspICYmCiAJ ICAgIElOVEVMX0dFTihpOTE1KSA8PSAxMCkKLQkJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwK LQkJCQkgICBHRU44X0dBTVdfRUNPX0RFVl9SV19JQSwKLQkJCQkgICBpbnRlbF91bmNvcmVfcmVh ZCh1bmNvcmUsCi0JCQkJCQkgICAgIEdFTjhfR0FNV19FQ09fREVWX1JXX0lBKSB8Ci0JCQkJICAg R0FNV19FQ09fRU5BQkxFXzY0S19JUFNfRklFTEQpOworCQlpbnRlbF91bmNvcmVfcm13KHVuY29y ZSwKKwkJCQkgR0VOOF9HQU1XX0VDT19ERVZfUldfSUEsCisJCQkJIDAsCisJCQkJIEdBTVdfRUNP X0VOQUJMRV82NEtfSVBTX0ZJRUxEKTsKIH0KIAogaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1 Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==