From: Tvrtko Ursulin Subject: [PATCH 10/14] drm/i915: Remove identical mmio read functions Date: Fri, 30 Sep 2016 18:48:45 +0100 Message-ID: <1475257729-11283-11-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475257729-11283-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 57C5F6E23F for ; Fri, 30 Sep 2016 17:49:07 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b4so4473671wmb.2 for ; Fri, 30 Sep 2016 10:49:07 -0700 (PDT) In-Reply-To: <1475257729-11283-1-git-send-email-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkl0IGlzIG5v dyBvYnZpb3VzIFZMViwgQ0hWIGFuZCBHZW45IG1taW8gcmVhZCBmY3VudGlvbnMgYXJlCmNvbXBs ZXRlbHkgaWRlbnRpY2FsIHNvIHdlIGNhbiByZW1vdmUgdGhlIHRocmVlIGNvcGllcyBhbmQKanVz dCBrZWVwIHRoZSBuZXdseSBuYW1lZCBnZW5lcmljIGltcGxlbWVudGF0aW9uLgoKdjI6IFVzZSBm d3RhYmxlIG5hbWluZyBjb25zaXN0ZW50bHkuIChKb29uYXMgTGFodGluZW4pCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1i eTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgNTQgKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyks IDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggOGU0 NmU3OTNhYzFiLi45ZDg3MGI5MDI5NDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j CkBAIC05MTEsOSArOTExLDkgQEAgZ2VuNl9yZWFkIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgaTkxNV9yZWdfdCByZWcsIGJvb2wgdHJhY2UpIHsgXAogCUdFTjZfUkVBRF9G T09URVI7IFwKIH0KIAotI2RlZmluZSBfX3Zsdl9yZWFkKHgpIFwKKyNkZWZpbmUgX19md3RhYmxl X3JlYWQoeCkgXAogc3RhdGljIHUjI3ggXAotdmx2X3JlYWQjI3goc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgYm9vbCB0cmFjZSkgeyBcCitmd3RhYmxl X3JlYWQjI3goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJl ZywgYm9vbCB0cmFjZSkgeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBmd19lbmdpbmU7IFwK IAlHRU42X1JFQURfSEVBREVSKHgpOyBcCiAJZndfZW5naW5lID0gX19md3RhYmxlX3JlZ19yZWFk X2Z3X2RvbWFpbnMob2Zmc2V0KTsgXApAQCAtOTIzLDUwICs5MjMsMTYgQEAgdmx2X3JlYWQjI3go c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgYm9vbCB0 cmFjZSkgeyBcCiAJR0VONl9SRUFEX0ZPT1RFUjsgXAogfQogCi0jZGVmaW5lIF9fY2h2X3JlYWQo eCkgXAotc3RhdGljIHUjI3ggXAotY2h2X3JlYWQjI3goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgYm9vbCB0cmFjZSkgeyBcCi0JZW51bSBmb3JjZXdh a2VfZG9tYWlucyBmd19lbmdpbmU7IFwKLQlHRU42X1JFQURfSEVBREVSKHgpOyBcCi0JZndfZW5n aW5lID0gX19md3RhYmxlX3JlZ19yZWFkX2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAotCWlmIChmd19l bmdpbmUpIFwKLQkJX19mb3JjZV93YWtlX2F1dG8oZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKLQl2 YWwgPSBfX3Jhd19pOTE1X3JlYWQjI3goZGV2X3ByaXYsIHJlZyk7IFwKLQlHRU42X1JFQURfRk9P VEVSOyBcCi19Ci0KLSNkZWZpbmUgX19nZW45X3JlYWQoeCkgXAotc3RhdGljIHUjI3ggXAotZ2Vu OV9yZWFkIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdfdCBy ZWcsIGJvb2wgdHJhY2UpIHsgXAotCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5lOyBc Ci0JR0VONl9SRUFEX0hFQURFUih4KTsgXAotCWZ3X2VuZ2luZSA9IF9fZnd0YWJsZV9yZWdfcmVh ZF9md19kb21haW5zKG9mZnNldCk7IFwKLQlpZiAoZndfZW5naW5lKSBcCi0JCV9fZm9yY2Vfd2Fr ZV9hdXRvKGRldl9wcml2LCBmd19lbmdpbmUpOyBcCi0JdmFsID0gX19yYXdfaTkxNV9yZWFkIyN4 KGRldl9wcml2LCByZWcpOyBcCi0JR0VONl9SRUFEX0ZPT1RFUjsgXAotfQotCi1fX2dlbjlfcmVh ZCg4KQotX19nZW45X3JlYWQoMTYpCi1fX2dlbjlfcmVhZCgzMikKLV9fZ2VuOV9yZWFkKDY0KQot X19jaHZfcmVhZCg4KQotX19jaHZfcmVhZCgxNikKLV9fY2h2X3JlYWQoMzIpCi1fX2Nodl9yZWFk KDY0KQotX192bHZfcmVhZCg4KQotX192bHZfcmVhZCgxNikKLV9fdmx2X3JlYWQoMzIpCi1fX3Zs dl9yZWFkKDY0KQorX19md3RhYmxlX3JlYWQoOCkKK19fZnd0YWJsZV9yZWFkKDE2KQorX19md3Rh YmxlX3JlYWQoMzIpCitfX2Z3dGFibGVfcmVhZCg2NCkKIF9fZ2VuNl9yZWFkKDgpCiBfX2dlbjZf cmVhZCgxNikKIF9fZ2VuNl9yZWFkKDMyKQogX19nZW42X3JlYWQoNjQpCiAKLSN1bmRlZiBfX2dl bjlfcmVhZAotI3VuZGVmIF9fY2h2X3JlYWQKLSN1bmRlZiBfX3Zsdl9yZWFkCisjdW5kZWYgX19m d3RhYmxlX3JlYWQKICN1bmRlZiBfX2dlbjZfcmVhZAogI3VuZGVmIEdFTjZfUkVBRF9GT09URVIK ICN1bmRlZiBHRU42X1JFQURfSEVBREVSCkBAIC0xMzI1LDEzICsxMjkxLDEzIEBAIHZvaWQgaW50 ZWxfdW5jb3JlX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWNhc2Ug OToKIAkJQVNTSUdOX0ZXX0RPTUFJTlNfVEFCTEUoX19nZW45X2Z3X3Jhbmdlcyk7CiAJCUFTU0lH Tl9XUklURV9NTUlPX1ZGVU5DUyhnZW45KTsKLQkJQVNTSUdOX1JFQURfTU1JT19WRlVOQ1MoZ2Vu OSk7CisJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGZ3dGFibGUpOwogCQlicmVhazsKIAljYXNl IDg6CiAJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJQVNTSUdOX0ZXX0RPTUFJ TlNfVEFCTEUoX19jaHZfZndfcmFuZ2VzKTsKIAkJCUFTU0lHTl9XUklURV9NTUlPX1ZGVU5DUyhj aHYpOwotCQkJQVNTSUdOX1JFQURfTU1JT19WRlVOQ1MoY2h2KTsKKwkJCUFTU0lHTl9SRUFEX01N SU9fVkZVTkNTKGZ3dGFibGUpOwogCiAJCX0gZWxzZSB7CiAJCQlBU1NJR05fV1JJVEVfTU1JT19W RlVOQ1MoZ2VuOCk7CkBAIC0xMzQ0LDcgKzEzMTAsNyBAQCB2b2lkIGludGVsX3VuY29yZV9pbml0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCQlpZiAoSVNfVkFMTEVZVklF VyhkZXZfcHJpdikpIHsKIAkJCUFTU0lHTl9GV19ET01BSU5TX1RBQkxFKF9fdmx2X2Z3X3Jhbmdl cyk7Ci0JCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyh2bHYpOworCQkJQVNTSUdOX1JFQURfTU1J T19WRlVOQ1MoZnd0YWJsZSk7CiAJCX0gZWxzZSB7CiAJCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5D UyhnZW42KTsKIAkJfQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=