From: Tvrtko Ursulin Subject: [PATCH 10/13] drm/i915: Remove identical mmio read functions Date: Thu, 29 Sep 2016 16:35:53 +0100 Message-ID: <1475163356-3463-11-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475163356-3463-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B24976E881 for ; Thu, 29 Sep 2016 15:36:16 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id w72so2683719wmf.1 for ; Thu, 29 Sep 2016 08:36:16 -0700 (PDT) In-Reply-To: <1475163356-3463-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 dCBrZWVwIHRoZSBuZXdseSBuYW1lZCBnZW5lcmljIGltcGxlbWVudGF0aW9uLgoKU2lnbmVkLW9m Zi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDU0ICsrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA0NCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNv cmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IGE0Y2UzNTc2 ZjhkNC4uNGY5ZjU3Nzc0ZTJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAt OTA1LDkgKzkwNSw5IEBAIGdlbjZfcmVhZCMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGk5MTVfcmVnX3QgcmVnLCBib29sIHRyYWNlKSB7IFwKIAlHRU42X1JFQURfRk9PVEVS OyBcCiB9CiAKLSNkZWZpbmUgX192bHZfcmVhZCh4KSBcCisjZGVmaW5lIF9fZnd0YmxfcmVhZCh4 KSBcCiBzdGF0aWMgdSMjeCBcCi12bHZfcmVhZCMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIGk5MTVfcmVnX3QgcmVnLCBib29sIHRyYWNlKSB7IFwKK2Z3dGJsX3JlYWQjI3go c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgYm9vbCB0 cmFjZSkgeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBmd19lbmdpbmU7IFwKIAlHRU42X1JF QURfSEVBREVSKHgpOyBcCiAJZndfZW5naW5lID0gX19md3RhYmxlX3JlZ19yZWFkX2Z3X2RvbWFp bnMob2Zmc2V0KTsgXApAQCAtOTE3LDUwICs5MTcsMTYgQEAgdmx2X3JlYWQjI3goc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgYm9vbCB0cmFjZSkgeyBc CiAJR0VONl9SRUFEX0ZPT1RFUjsgXAogfQogCi0jZGVmaW5lIF9fY2h2X3JlYWQoeCkgXAotc3Rh dGljIHUjI3ggXAotY2h2X3JlYWQjI3goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCBpOTE1X3JlZ190IHJlZywgYm9vbCB0cmFjZSkgeyBcCi0JZW51bSBmb3JjZXdha2VfZG9tYWlu cyBmd19lbmdpbmU7IFwKLQlHRU42X1JFQURfSEVBREVSKHgpOyBcCi0JZndfZW5naW5lID0gX19m d3RhYmxlX3JlZ19yZWFkX2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAotCWlmIChmd19lbmdpbmUpIFwK LQkJX19mb3JjZV93YWtlX2F1dG8oZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKLQl2YWwgPSBfX3Jh d19pOTE1X3JlYWQjI3goZGV2X3ByaXYsIHJlZyk7IFwKLQlHRU42X1JFQURfRk9PVEVSOyBcCi19 Ci0KLSNkZWZpbmUgX19nZW45X3JlYWQoeCkgXAotc3RhdGljIHUjI3ggXAotZ2VuOV9yZWFkIyN4 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdfdCByZWcsIGJvb2wg dHJhY2UpIHsgXAotCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5lOyBcCi0JR0VONl9S RUFEX0hFQURFUih4KTsgXAotCWZ3X2VuZ2luZSA9IF9fZnd0YWJsZV9yZWdfcmVhZF9md19kb21h aW5zKG9mZnNldCk7IFwKLQlpZiAoZndfZW5naW5lKSBcCi0JCV9fZm9yY2Vfd2FrZV9hdXRvKGRl dl9wcml2LCBmd19lbmdpbmUpOyBcCi0JdmFsID0gX19yYXdfaTkxNV9yZWFkIyN4KGRldl9wcml2 LCByZWcpOyBcCi0JR0VONl9SRUFEX0ZPT1RFUjsgXAotfQotCi1fX2dlbjlfcmVhZCg4KQotX19n ZW45X3JlYWQoMTYpCi1fX2dlbjlfcmVhZCgzMikKLV9fZ2VuOV9yZWFkKDY0KQotX19jaHZfcmVh ZCg4KQotX19jaHZfcmVhZCgxNikKLV9fY2h2X3JlYWQoMzIpCi1fX2Nodl9yZWFkKDY0KQotX192 bHZfcmVhZCg4KQotX192bHZfcmVhZCgxNikKLV9fdmx2X3JlYWQoMzIpCi1fX3Zsdl9yZWFkKDY0 KQorX19md3RibF9yZWFkKDgpCitfX2Z3dGJsX3JlYWQoMTYpCitfX2Z3dGJsX3JlYWQoMzIpCitf X2Z3dGJsX3JlYWQoNjQpCiBfX2dlbjZfcmVhZCg4KQogX19nZW42X3JlYWQoMTYpCiBfX2dlbjZf cmVhZCgzMikKIF9fZ2VuNl9yZWFkKDY0KQogCi0jdW5kZWYgX19nZW45X3JlYWQKLSN1bmRlZiBf X2Nodl9yZWFkCi0jdW5kZWYgX192bHZfcmVhZAorI3VuZGVmIF9fZnd0YmxfcmVhZAogI3VuZGVm IF9fZ2VuNl9yZWFkCiAjdW5kZWYgR0VONl9SRUFEX0ZPT1RFUgogI3VuZGVmIEdFTjZfUkVBRF9I RUFERVIKQEAgLTEzMTksMTMgKzEyODUsMTMgQEAgdm9pZCBpbnRlbF91bmNvcmVfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJY2FzZSA5OgogCQlBU1NJR05fRldfRE9N QUlOU19UQUJMRShfX2dlbjlfZndfcmFuZ2VzKTsKIAkJQVNTSUdOX1dSSVRFX01NSU9fVkZVTkNT KGdlbjkpOwotCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyhnZW45KTsKKwkJQVNTSUdOX1JFQURf TU1JT19WRlVOQ1MoZnd0YmwpOwogCQlicmVhazsKIAljYXNlIDg6CiAJCWlmIChJU19DSEVSUllW SUVXKGRldl9wcml2KSkgewogCQkJQVNTSUdOX0ZXX0RPTUFJTlNfVEFCTEUoX19jaHZfZndfcmFu Z2VzKTsKIAkJCUFTU0lHTl9XUklURV9NTUlPX1ZGVU5DUyhjaHYpOwotCQkJQVNTSUdOX1JFQURf TU1JT19WRlVOQ1MoY2h2KTsKKwkJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGZ3dGJsKTsKIAog CQl9IGVsc2UgewogCQkJQVNTSUdOX1dSSVRFX01NSU9fVkZVTkNTKGdlbjgpOwpAQCAtMTMzOCw3 ICsxMzA0LDcgQEAgdm9pZCBpbnRlbF91bmNvcmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAKIAkJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7CiAJCQlBU1NJ R05fRldfRE9NQUlOU19UQUJMRShfX3Zsdl9md19yYW5nZXMpOwotCQkJQVNTSUdOX1JFQURfTU1J T19WRlVOQ1Modmx2KTsKKwkJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGZ3dGJsKTsKIAkJfSBl bHNlIHsKIAkJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGdlbjYpOwogCQl9Ci0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==