From: Tvrtko Ursulin Subject: [PATCH 11/13] drm/i915: Remove identical write mmmio functions Date: Thu, 29 Sep 2016 16:35:54 +0100 Message-ID: <1475163356-3463-12-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B59AF6E87B for ; Thu, 29 Sep 2016 15:36:17 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id b184so11308500wma.3 for ; Thu, 29 Sep 2016 08:36:17 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIG5vdGlj ZSB0d28gaWRlbnRpY2FsIGNvcGllcyBvZiB0aGUgc2hhZG93IHJlZ2lzdGVyIHRhYmxlIGFuZApm b2xsb3dpbmcgZnJvbSB0aGF0IHJlbW92YWwgY2FuIGFsc28gdW5pZnkgQ0hWIGFuZCBHZW45IHdy aXRlCm1taW8gZnVuY3Rpb25zIGFuZCBtYWNyb3MgaW50byBhIHNpbmdsZSBpbXBsZW1lbnRhdGlv bi4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCA2OSArKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0 aW9ucygrKSwgNTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpp bmRleCA0ZjlmNTc3NzRlMmEuLjg5M2Q3M2M3MzY4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMKQEAgLTcwNiw3ICs3MDYsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2Zv cmNld2FrZV9yYW5nZSBfX2Nodl9md19yYW5nZXNbXSA9IHsKIAlHRU5fRldfUkFOR0UoMHgzMDAw MCwgMHgzN2ZmZiwgRk9SQ0VXQUtFX01FRElBKSwKIH07CiAKLSNkZWZpbmUgX19jaHZfcmVnX3dy aXRlX2Z3X2RvbWFpbnMob2Zmc2V0KSBcCisjZGVmaW5lIF9fZnd0YmxfcmVnX3dyaXRlX2Z3X2Rv bWFpbnMob2Zmc2V0KSBcCiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7 IFwKIAlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkgJiYgIWlzX2dlbjhfc2hhZG93ZWQo b2Zmc2V0KSkgXApAQCAtNzUwLDM0ICs3NTAsNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVs X2ZvcmNld2FrZV9yYW5nZSBfX2dlbjlfZndfcmFuZ2VzW10gPSB7CiAJR0VOX0ZXX1JBTkdFKDB4 MzAwMDAsIDB4M2ZmZmYsIEZPUkNFV0FLRV9NRURJQSksCiB9OwogCi1zdGF0aWMgY29uc3QgaTkx NV9yZWdfdCBnZW45X3NoYWRvd2VkX3JlZ3NbXSA9IHsKLQlSSU5HX1RBSUwoUkVOREVSX1JJTkdf QkFTRSksCi0JUklOR19UQUlMKEdFTjZfQlNEX1JJTkdfQkFTRSksCi0JUklOR19UQUlMKFZFQk9Y X1JJTkdfQkFTRSksCi0JUklOR19UQUlMKEJMVF9SSU5HX0JBU0UpLAotCUdFTjZfUlBOU1dSRVEs Ci0JR0VONl9SQ19WSURFT19GUkVRLAotCS8qIFRPRE86IE90aGVyIHJlZ2lzdGVycyBhcmUgbm90 IHlldCB1c2VkICovCi19OwotCi1zdGF0aWMgYm9vbCBpc19nZW45X3NoYWRvd2VkKHUzMiBvZmZz ZXQpCi17Ci0JaW50IGk7Ci0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZ2VuOV9zaGFkb3dl ZF9yZWdzKTsgaSsrKQotCQlpZiAob2Zmc2V0ID09IGdlbjlfc2hhZG93ZWRfcmVnc1tpXS5yZWcp Ci0JCQlyZXR1cm4gdHJ1ZTsKLQotCXJldHVybiBmYWxzZTsKLX0KLQotI2RlZmluZSBfX2dlbjlf cmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KSBcCi0oeyBcCi0JZW51bSBmb3JjZXdha2VfZG9t YWlucyBfX2Z3ZCA9IDA7IFwKLQlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkgJiYgIWlz X2dlbjlfc2hhZG93ZWQob2Zmc2V0KSkgXAotCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9w cml2LCBvZmZzZXQpOyBcCi0JX19md2Q7IFwKLX0pCi0KIHN0YXRpYyB2b2lkCiBpbGtfZHVtbXlf d3JpdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewpAQCAtMTAzNCwzNyAr MTAwNiwyMSBAQCBnZW44X3dyaXRlIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgaTkxNV9yZWdfdCByZWcsIHUjI3ggdmFsLCBib29sCiAJR0VONl9XUklURV9GT09URVI7IFwK IH0KIAotI2RlZmluZSBfX2Nodl93cml0ZSh4KSBcCi1zdGF0aWMgdm9pZCBcCi1jaHZfd3JpdGUj I3goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgdSMj eCB2YWwsIGJvb2wgdHJhY2UpIHsgXAotCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5l OyBcCi0JR0VONl9XUklURV9IRUFERVI7IFwKLQlmd19lbmdpbmUgPSBfX2Nodl9yZWdfd3JpdGVf ZndfZG9tYWlucyhvZmZzZXQpOyBcCi0JaWYgKGZ3X2VuZ2luZSkgXAotCQlfX2ZvcmNlX3dha2Vf YXV0byhkZXZfcHJpdiwgZndfZW5naW5lKTsgXAotCV9fcmF3X2k5MTVfd3JpdGUjI3goZGV2X3By aXYsIHJlZywgdmFsKTsgXAotCUdFTjZfV1JJVEVfRk9PVEVSOyBcCi19Ci0KLSNkZWZpbmUgX19n ZW45X3dyaXRlKHgpIFwKKyNkZWZpbmUgX19md3RibF93cml0ZSh4KSBcCiBzdGF0aWMgdm9pZCBc Ci1nZW45X3dyaXRlIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9y ZWdfdCByZWcsIHUjI3ggdmFsLCBcCi0JCWJvb2wgdHJhY2UpIHsgXAorZnd0Ymxfd3JpdGUjI3go c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgdSMjeCB2 YWwsIGJvb2wgdHJhY2UpIHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5lOyBc CiAJR0VONl9XUklURV9IRUFERVI7IFwKLQlmd19lbmdpbmUgPSBfX2dlbjlfcmVnX3dyaXRlX2Z3 X2RvbWFpbnMob2Zmc2V0KTsgXAorCWZ3X2VuZ2luZSA9IF9fZnd0YmxfcmVnX3dyaXRlX2Z3X2Rv bWFpbnMob2Zmc2V0KTsgXAogCWlmIChmd19lbmdpbmUpIFwKIAkJX19mb3JjZV93YWtlX2F1dG8o ZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKIAlfX3Jhd19pOTE1X3dyaXRlIyN4KGRldl9wcml2LCBy ZWcsIHZhbCk7IFwKIAlHRU42X1dSSVRFX0ZPT1RFUjsgXAogfQogCi1fX2dlbjlfd3JpdGUoOCkK LV9fZ2VuOV93cml0ZSgxNikKLV9fZ2VuOV93cml0ZSgzMikKLV9fY2h2X3dyaXRlKDgpCi1fX2No dl93cml0ZSgxNikKLV9fY2h2X3dyaXRlKDMyKQorX19md3RibF93cml0ZSg4KQorX19md3RibF93 cml0ZSgxNikKK19fZnd0Ymxfd3JpdGUoMzIpCiBfX2dlbjhfd3JpdGUoOCkKIF9fZ2VuOF93cml0 ZSgxNikKIF9fZ2VuOF93cml0ZSgzMikKQEAgLTEwNzIsOCArMTAyOCw3IEBAIF9fZ2VuNl93cml0 ZSg4KQogX19nZW42X3dyaXRlKDE2KQogX19nZW42X3dyaXRlKDMyKQogCi0jdW5kZWYgX19nZW45 X3dyaXRlCi0jdW5kZWYgX19jaHZfd3JpdGUKKyN1bmRlZiBfX2Z3dGJsX3dyaXRlCiAjdW5kZWYg X19nZW44X3dyaXRlCiAjdW5kZWYgX19nZW42X3dyaXRlCiAjdW5kZWYgR0VONl9XUklURV9GT09U RVIKQEAgLTEyODQsMTMgKzEyMzksMTMgQEAgdm9pZCBpbnRlbF91bmNvcmVfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGVmYXVsdDoKIAljYXNlIDk6CiAJCUFTU0lH Tl9GV19ET01BSU5TX1RBQkxFKF9fZ2VuOV9md19yYW5nZXMpOwotCQlBU1NJR05fV1JJVEVfTU1J T19WRlVOQ1MoZ2VuOSk7CisJCUFTU0lHTl9XUklURV9NTUlPX1ZGVU5DUyhmd3RibCk7CiAJCUFT U0lHTl9SRUFEX01NSU9fVkZVTkNTKGZ3dGJsKTsKIAkJYnJlYWs7CiAJY2FzZSA4OgogCQlpZiAo SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJCUFTU0lHTl9GV19ET01BSU5TX1RBQkxFKF9f Y2h2X2Z3X3Jhbmdlcyk7Ci0JCQlBU1NJR05fV1JJVEVfTU1JT19WRlVOQ1MoY2h2KTsKKwkJCUFT U0lHTl9XUklURV9NTUlPX1ZGVU5DUyhmd3RibCk7CiAJCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5D Uyhmd3RibCk7CiAKIAkJfSBlbHNlIHsKQEAgLTE4MTksMTEgKzE3NzQsMTEgQEAgaW50ZWxfdW5j b3JlX2ZvcmNld2FrZV9mb3Jfd3JpdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCiAJc3dpdGNoIChJTlRFTF9HRU4oZGV2X3ByaXYpKSB7CiAJY2FzZSA5OgotCQlmd19kb21h aW5zID0gX19nZW45X3JlZ193cml0ZV9md19kb21haW5zKGk5MTVfbW1pb19yZWdfb2Zmc2V0KHJl ZykpOworCQlmd19kb21haW5zID0gX19md3RibF9yZWdfd3JpdGVfZndfZG9tYWlucyhpOTE1X21t aW9fcmVnX29mZnNldChyZWcpKTsKIAkJYnJlYWs7CiAJY2FzZSA4OgogCQlpZiAoSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpCi0JCQlmd19kb21haW5zID0gX19jaHZfcmVnX3dyaXRlX2Z3X2RvbWFp bnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKSk7CisJCQlmd19kb21haW5zID0gX19md3RibF9y ZWdfd3JpdGVfZndfZG9tYWlucyhpOTE1X21taW9fcmVnX29mZnNldChyZWcpKTsKIAkJZWxzZQog CQkJZndfZG9tYWlucyA9IF9fZ2VuOF9yZWdfd3JpdGVfZndfZG9tYWlucyhpOTE1X21taW9fcmVn X29mZnNldChyZWcpKTsKIAkJYnJlYWs7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==