From: Tvrtko Ursulin Subject: [PATCH 11/14] drm/i915: Remove identical write mmmio functions Date: Fri, 30 Sep 2016 18:48:46 +0100 Message-ID: <1475257729-11283-12-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 763126E23F for ; Fri, 30 Sep 2016 17:49:08 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id p197so2989003wmg.1 for ; Fri, 30 Sep 2016 10:49:08 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIG5vdGlj ZSB0d28gaWRlbnRpY2FsIGNvcGllcyBvZiB0aGUgc2hhZG93IHJlZ2lzdGVyIHRhYmxlIGFuZApm b2xsb3dpbmcgZnJvbSB0aGF0IHJlbW92YWwgY2FuIGFsc28gdW5pZnkgQ0hWIGFuZCBHZW45IHdy aXRlCm1taW8gZnVuY3Rpb25zIGFuZCBtYWNyb3MgaW50byBhIHNpbmdsZSBpbXBsZW1lbnRhdGlv bi4KCnYyOiBOYW1lIGZ3dGFibGUgY29uc2lzdGVudGx5IGFuZCB1c2UgSEFTX0ZXVEFCTEUuIChK b29uYXMgTGFodGluZW4pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j IHwgOTQgKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDE5IGluc2VydGlvbnMoKyksIDc1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMKaW5kZXggOWQ4NzBiOTAyOTQ3Li5kZWU0ZTkzZDQ4MmQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC03MTIsNyArNzEyLDcgQEAgc3RhdGljIGNvbnN0IHN0 cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX19jaHZfZndfcmFuZ2VzW10gPSB7CiAJR0VOX0ZX X1JBTkdFKDB4MzAwMDAsIDB4MzdmZmYsIEZPUkNFV0FLRV9NRURJQSksCiB9OwogCi0jZGVmaW5l IF9fY2h2X3JlZ193cml0ZV9md19kb21haW5zKG9mZnNldCkgXAorI2RlZmluZSBfX2Z3dGFibGVf cmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KSBcCiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9t YWlucyBfX2Z3ZCA9IDA7IFwKIAlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkgJiYgIWlz X2dlbjhfc2hhZG93ZWQob2Zmc2V0KSkgXApAQCAtNzU2LDM0ICs3NTYsNiBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSBfX2dlbjlfZndfcmFuZ2VzW10gPSB7CiAJ R0VOX0ZXX1JBTkdFKDB4MzAwMDAsIDB4M2ZmZmYsIEZPUkNFV0FLRV9NRURJQSksCiB9OwogCi1z dGF0aWMgY29uc3QgaTkxNV9yZWdfdCBnZW45X3NoYWRvd2VkX3JlZ3NbXSA9IHsKLQlSSU5HX1RB SUwoUkVOREVSX1JJTkdfQkFTRSksCi0JUklOR19UQUlMKEdFTjZfQlNEX1JJTkdfQkFTRSksCi0J UklOR19UQUlMKFZFQk9YX1JJTkdfQkFTRSksCi0JUklOR19UQUlMKEJMVF9SSU5HX0JBU0UpLAot CUdFTjZfUlBOU1dSRVEsCi0JR0VONl9SQ19WSURFT19GUkVRLAotCS8qIFRPRE86IE90aGVyIHJl Z2lzdGVycyBhcmUgbm90IHlldCB1c2VkICovCi19OwotCi1zdGF0aWMgYm9vbCBpc19nZW45X3No YWRvd2VkKHUzMiBvZmZzZXQpCi17Ci0JaW50IGk7Ci0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJ WkUoZ2VuOV9zaGFkb3dlZF9yZWdzKTsgaSsrKQotCQlpZiAob2Zmc2V0ID09IGdlbjlfc2hhZG93 ZWRfcmVnc1tpXS5yZWcpCi0JCQlyZXR1cm4gdHJ1ZTsKLQotCXJldHVybiBmYWxzZTsKLX0KLQot I2RlZmluZSBfX2dlbjlfcmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KSBcCi0oeyBcCi0JZW51 bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwKLQlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgo b2Zmc2V0KSkgJiYgIWlzX2dlbjlfc2hhZG93ZWQob2Zmc2V0KSkgXAotCQlfX2Z3ZCA9IGZpbmRf ZndfZG9tYWluKGRldl9wcml2LCBvZmZzZXQpOyBcCi0JX19md2Q7IFwKLX0pCi0KIHN0YXRpYyB2 b2lkCiBpbGtfZHVtbXlfd3JpdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog ewpAQCAtMTA0MCwzNyArMTAxMiwyMSBAQCBnZW44X3dyaXRlIyN4KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdfdCByZWcsIHUjI3ggdmFsLCBib29sCiAJR0VONl9X UklURV9GT09URVI7IFwKIH0KIAotI2RlZmluZSBfX2Nodl93cml0ZSh4KSBcCisjZGVmaW5lIF9f Znd0YWJsZV93cml0ZSh4KSBcCiBzdGF0aWMgdm9pZCBcCi1jaHZfd3JpdGUjI3goc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgdSMjeCB2YWwsIGJvb2wg dHJhY2UpIHsgXAorZnd0YWJsZV93cml0ZSMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGk5MTVfcmVnX3QgcmVnLCB1IyN4IHZhbCwgYm9vbCB0cmFjZSkgeyBcCiAJZW51bSBm b3JjZXdha2VfZG9tYWlucyBmd19lbmdpbmU7IFwKIAlHRU42X1dSSVRFX0hFQURFUjsgXAotCWZ3 X2VuZ2luZSA9IF9fY2h2X3JlZ193cml0ZV9md19kb21haW5zKG9mZnNldCk7IFwKKwlmd19lbmdp bmUgPSBfX2Z3dGFibGVfcmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAogCWlmIChmd19l bmdpbmUpIFwKIAkJX19mb3JjZV93YWtlX2F1dG8oZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKIAlf X3Jhd19pOTE1X3dyaXRlIyN4KGRldl9wcml2LCByZWcsIHZhbCk7IFwKIAlHRU42X1dSSVRFX0ZP T1RFUjsgXAogfQogCi0jZGVmaW5lIF9fZ2VuOV93cml0ZSh4KSBcCi1zdGF0aWMgdm9pZCBcCi1n ZW45X3dyaXRlIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdf dCByZWcsIHUjI3ggdmFsLCBcCi0JCWJvb2wgdHJhY2UpIHsgXAotCWVudW0gZm9yY2V3YWtlX2Rv bWFpbnMgZndfZW5naW5lOyBcCi0JR0VONl9XUklURV9IRUFERVI7IFwKLQlmd19lbmdpbmUgPSBf X2dlbjlfcmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAotCWlmIChmd19lbmdpbmUpIFwK LQkJX19mb3JjZV93YWtlX2F1dG8oZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKLQlfX3Jhd19pOTE1 X3dyaXRlIyN4KGRldl9wcml2LCByZWcsIHZhbCk7IFwKLQlHRU42X1dSSVRFX0ZPT1RFUjsgXAot fQotCi1fX2dlbjlfd3JpdGUoOCkKLV9fZ2VuOV93cml0ZSgxNikKLV9fZ2VuOV93cml0ZSgzMikK LV9fY2h2X3dyaXRlKDgpCi1fX2Nodl93cml0ZSgxNikKLV9fY2h2X3dyaXRlKDMyKQorX19md3Rh YmxlX3dyaXRlKDgpCitfX2Z3dGFibGVfd3JpdGUoMTYpCitfX2Z3dGFibGVfd3JpdGUoMzIpCiBf X2dlbjhfd3JpdGUoOCkKIF9fZ2VuOF93cml0ZSgxNikKIF9fZ2VuOF93cml0ZSgzMikKQEAgLTEw NzgsOCArMTAzNCw3IEBAIF9fZ2VuNl93cml0ZSg4KQogX19nZW42X3dyaXRlKDE2KQogX19nZW42 X3dyaXRlKDMyKQogCi0jdW5kZWYgX19nZW45X3dyaXRlCi0jdW5kZWYgX19jaHZfd3JpdGUKKyN1 bmRlZiBfX2Z3dGFibGVfd3JpdGUKICN1bmRlZiBfX2dlbjhfd3JpdGUKICN1bmRlZiBfX2dlbjZf d3JpdGUKICN1bmRlZiBHRU42X1dSSVRFX0ZPT1RFUgpAQCAtMTI5MCwxMyArMTI0NSwxMyBAQCB2 b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAlkZWZhdWx0OgogCWNhc2UgOToKIAkJQVNTSUdOX0ZXX0RPTUFJTlNfVEFCTEUoX19nZW45X2Z3 X3Jhbmdlcyk7Ci0JCUFTU0lHTl9XUklURV9NTUlPX1ZGVU5DUyhnZW45KTsKKwkJQVNTSUdOX1dS SVRFX01NSU9fVkZVTkNTKGZ3dGFibGUpOwogCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyhmd3Rh YmxlKTsKIAkJYnJlYWs7CiAJY2FzZSA4OgogCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikp IHsKIAkJCUFTU0lHTl9GV19ET01BSU5TX1RBQkxFKF9fY2h2X2Z3X3Jhbmdlcyk7Ci0JCQlBU1NJ R05fV1JJVEVfTU1JT19WRlVOQ1MoY2h2KTsKKwkJCUFTU0lHTl9XUklURV9NTUlPX1ZGVU5DUyhm d3RhYmxlKTsKIAkJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGZ3dGFibGUpOwogCiAJCX0gZWxz ZSB7CkBAIC0xNzk5LDI5ICsxNzU0LDE4IEBAIHN0YXRpYyBlbnVtIGZvcmNld2FrZV9kb21haW5z CiBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2Zvcl93cml0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkJIGk5MTVfcmVnX3QgcmVnKQogeworCXUzMiBvZmZzZXQgPSBpOTE1 X21taW9fcmVnX29mZnNldChyZWcpOwogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWlu czsKIAotCXN3aXRjaCAoSU5URUxfR0VOKGRldl9wcml2KSkgewotCWNhc2UgOToKLQkJZndfZG9t YWlucyA9IF9fZ2VuOV9yZWdfd3JpdGVfZndfZG9tYWlucyhpOTE1X21taW9fcmVnX29mZnNldChy ZWcpKTsKLQkJYnJlYWs7Ci0JY2FzZSA4OgotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikp Ci0JCQlmd19kb21haW5zID0gX19jaHZfcmVnX3dyaXRlX2Z3X2RvbWFpbnMoaTkxNV9tbWlvX3Jl Z19vZmZzZXQocmVnKSk7Ci0JCWVsc2UKLQkJCWZ3X2RvbWFpbnMgPSBfX2dlbjhfcmVnX3dyaXRl X2Z3X2RvbWFpbnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKSk7Ci0JCWJyZWFrOwotCWNhc2Ug NzoKLQljYXNlIDY6CisJaWYgKEhBU19GV1RBQkxFKGRldl9wcml2KSAmJiAhSVNfVkFMTEVZVklF VyhkZXZfcHJpdikpIHsKKwkJZndfZG9tYWlucyA9IF9fZnd0YWJsZV9yZWdfd3JpdGVfZndfZG9t YWlucyhvZmZzZXQpOworCX0gZWxzZSBpZiAoSVNfR0VOOChkZXZfcHJpdikpIHsKKwkJZndfZG9t YWlucyA9IF9fZ2VuOF9yZWdfd3JpdGVfZndfZG9tYWlucyhvZmZzZXQpOworCX0gZWxzZSBpZiAo SVNfR0VOKGRldl9wcml2LCA2LCA3KSkgewogCQlmd19kb21haW5zID0gRk9SQ0VXQUtFX1JFTkRF UjsKLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKElOVEVMX0lORk8oZGV2X3By aXYpLT5nZW4pOwotCWNhc2UgNToKLQljYXNlIDQ6Ci0JY2FzZSAzOgotCWNhc2UgMjoKLQkJcmV0 dXJuIDA7CisJfSBlbHNlIHsKKwkJV0FSTl9PTighSVNfR0VOKGRldl9wcml2LCAyLCA1KSk7CisJ CWZ3X2RvbWFpbnMgPSAwOwogCX0KIAogCVdBUk5fT04oZndfZG9tYWlucyAmIH5kZXZfcHJpdi0+ dW5jb3JlLmZ3X2RvbWFpbnMpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=