From: Tvrtko Ursulin Subject: [PATCH 09/14] drm/i915: Remove identical macros Date: Fri, 30 Sep 2016 18:48:44 +0100 Message-ID: <1475257729-11283-10-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 BFFD46E23F for ; Fri, 30 Sep 2016 17:49:06 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b4so4473642wmb.2 for ; Fri, 30 Sep 2016 10:49:06 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlbW92ZSBz b21lIG1hY3JvcyB3aGljaCBhcmUgbm93IG9idmlvdXNseSBpZGVudGljYWwuCgp2MjogQWRkZWQg SEFTX0ZXVEFCTEUgbWFjcm8gYW5kIHNpbXBsaWZpZWQgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9m b3JfcmVhZC4KICAgIChKb29uYXMgTGFodGluZW4pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jIHwgNzAgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDUwIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggMDUwNTk2ZmU5MGM1Li44ZTQ2ZTc5M2Fj MWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC02MzgsNiArNjM4LDExIEBA IGludGVsX2Z3X3RhYmxlX2NoZWNrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK ICNkZWZpbmUgR0VOX0ZXX1JBTkdFKHMsIGUsIGQpIFwKIAl7IC5zdGFydCA9IChzKSwgLmVuZCA9 IChlKSwgLmRvbWFpbnMgPSAoZCkgfQogCisjZGVmaW5lIEhBU19GV1RBQkxFKGRldl9wcml2KSBc CisJKElTX0dFTjkoZGV2X3ByaXYpIHx8IFwKKwkgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgfHwg XAorCSBJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKKwogLyogKk11c3QqIGJlIHNvcnRlZCBieSBv ZmZzZXQgcmFuZ2VzISBTZWUgaW50ZWxfZndfdGFibGVfY2hlY2soKS4gKi8KIHN0YXRpYyBjb25z dCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fdmx2X2Z3X3Jhbmdlc1tdID0gewogCUdF Tl9GV19SQU5HRSgweDIwMDAsIDB4M2ZmZiwgRk9SQ0VXQUtFX1JFTkRFUiksCkBAIC02NDksNyAr NjU0LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX192bHZf ZndfcmFuZ2VzW10gPSB7CiAJR0VOX0ZXX1JBTkdFKDB4MzAwMDAsIDB4M2ZmZmYsIEZPUkNFV0FL RV9NRURJQSksCiB9OwogCi0jZGVmaW5lIF9fdmx2X3JlZ19yZWFkX2Z3X2RvbWFpbnMob2Zmc2V0 KSBcCisjZGVmaW5lIF9fZnd0YWJsZV9yZWdfcmVhZF9md19kb21haW5zKG9mZnNldCkgXAogKHsg XAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19md2QgPSAwOyBcCiAJaWYgKE5FRURTX0ZPUkNF X1dBS0UoKG9mZnNldCkpKSBcCkBAIC03MDcsMTQgKzcxMiw2IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fY2h2X2Z3X3Jhbmdlc1tdID0gewogCUdFTl9GV19S QU5HRSgweDMwMDAwLCAweDM3ZmZmLCBGT1JDRVdBS0VfTUVESUEpLAogfTsKIAotI2RlZmluZSBf X2Nodl9yZWdfcmVhZF9md19kb21haW5zKG9mZnNldCkgXAotKHsgXAotCWVudW0gZm9yY2V3YWtl X2RvbWFpbnMgX19md2QgPSAwOyBcCi0JaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpKSBc Ci0JCV9fZndkID0gZmluZF9md19kb21haW4oZGV2X3ByaXYsIG9mZnNldCk7IFwKLQlfX2Z3ZDsg XAotfSkKLQogI2RlZmluZSBfX2Nodl9yZWdfd3JpdGVfZndfZG9tYWlucyhvZmZzZXQpIFwKICh7 IFwKIAllbnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXApAQCAtNzU5LDE0ICs3NTYs NiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSBfX2dlbjlfZndf cmFuZ2VzW10gPSB7CiAJR0VOX0ZXX1JBTkdFKDB4MzAwMDAsIDB4M2ZmZmYsIEZPUkNFV0FLRV9N RURJQSksCiB9OwogCi0jZGVmaW5lIF9fZ2VuOV9yZWdfcmVhZF9md19kb21haW5zKG9mZnNldCkg XAotKHsgXAotCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19md2QgPSAwOyBcCi0JaWYgKE5FRURT X0ZPUkNFX1dBS0UoKG9mZnNldCkpKSBcCi0JCV9fZndkID0gZmluZF9md19kb21haW4oZGV2X3By aXYsIG9mZnNldCk7IFwKLQlfX2Z3ZDsgXAotfSkKLQogc3RhdGljIGNvbnN0IGk5MTVfcmVnX3Qg Z2VuOV9zaGFkb3dlZF9yZWdzW10gPSB7CiAJUklOR19UQUlMKFJFTkRFUl9SSU5HX0JBU0UpLAog CVJJTkdfVEFJTChHRU42X0JTRF9SSU5HX0JBU0UpLApAQCAtOTI3LDcgKzkxNiw3IEBAIHN0YXRp YyB1IyN4IFwKIHZsdl9yZWFkIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg aTkxNV9yZWdfdCByZWcsIGJvb2wgdHJhY2UpIHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMg ZndfZW5naW5lOyBcCiAJR0VONl9SRUFEX0hFQURFUih4KTsgXAotCWZ3X2VuZ2luZSA9IF9fdmx2 X3JlZ19yZWFkX2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAorCWZ3X2VuZ2luZSA9IF9fZnd0YWJsZV9y ZWdfcmVhZF9md19kb21haW5zKG9mZnNldCk7IFwKIAlpZiAoZndfZW5naW5lKSBcCiAJCV9fZm9y Y2Vfd2FrZV9hdXRvKGRldl9wcml2LCBmd19lbmdpbmUpOyBcCiAJdmFsID0gX19yYXdfaTkxNV9y ZWFkIyN4KGRldl9wcml2LCByZWcpOyBcCkBAIC05MzksNyArOTI4LDcgQEAgc3RhdGljIHUjI3gg XAogY2h2X3JlYWQjI3goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3Jl Z190IHJlZywgYm9vbCB0cmFjZSkgeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBmd19lbmdp bmU7IFwKIAlHRU42X1JFQURfSEVBREVSKHgpOyBcCi0JZndfZW5naW5lID0gX19jaHZfcmVnX3Jl YWRfZndfZG9tYWlucyhvZmZzZXQpOyBcCisJZndfZW5naW5lID0gX19md3RhYmxlX3JlZ19yZWFk X2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAogCWlmIChmd19lbmdpbmUpIFwKIAkJX19mb3JjZV93YWtl X2F1dG8oZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKIAl2YWwgPSBfX3Jhd19pOTE1X3JlYWQjI3go ZGV2X3ByaXYsIHJlZyk7IFwKQEAgLTk1MSw3ICs5NDAsNyBAQCBzdGF0aWMgdSMjeCBcCiBnZW45 X3JlYWQjI3goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJl ZywgYm9vbCB0cmFjZSkgeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBmd19lbmdpbmU7IFwK IAlHRU42X1JFQURfSEVBREVSKHgpOyBcCi0JZndfZW5naW5lID0gX19nZW45X3JlZ19yZWFkX2Z3 X2RvbWFpbnMob2Zmc2V0KTsgXAorCWZ3X2VuZ2luZSA9IF9fZnd0YWJsZV9yZWdfcmVhZF9md19k b21haW5zKG9mZnNldCk7IFwKIAlpZiAoZndfZW5naW5lKSBcCiAJCV9fZm9yY2Vfd2FrZV9hdXRv KGRldl9wcml2LCBmd19lbmdpbmUpOyBcCiAJdmFsID0gX19yYXdfaTkxNV9yZWFkIyN4KGRldl9w cml2LCByZWcpOyBcCkBAIC0xODIzLDM1ICsxODEyLDE2IEBAIHN0YXRpYyBlbnVtIGZvcmNld2Fr ZV9kb21haW5zCiBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2Zvcl9yZWFkKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQlpOTE1X3JlZ190IHJlZykKIHsKKwl1MzIgb2Zmc2V0 ID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKTsKIAllbnVtIGZvcmNld2FrZV9kb21haW5zIGZ3 X2RvbWFpbnM7CiAKLQlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2X3ByaXYpKQotCQlyZXR1cm4g MDsKLQotCXN3aXRjaCAoSU5URUxfR0VOKGRldl9wcml2KSkgewotCWNhc2UgOToKLQkJZndfZG9t YWlucyA9IF9fZ2VuOV9yZWdfcmVhZF9md19kb21haW5zKGk5MTVfbW1pb19yZWdfb2Zmc2V0KHJl ZykpOwotCQlicmVhazsKLQljYXNlIDg6Ci0JCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkK LQkJCWZ3X2RvbWFpbnMgPSBfX2Nodl9yZWdfcmVhZF9md19kb21haW5zKGk5MTVfbW1pb19yZWdf b2Zmc2V0KHJlZykpOwotCQllbHNlCi0JCQlmd19kb21haW5zID0gX19nZW42X3JlZ19yZWFkX2Z3 X2RvbWFpbnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKSk7Ci0JCWJyZWFrOwotCWNhc2UgNzoK LQljYXNlIDY6Ci0JCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKLQkJCWZ3X2RvbWFpbnMg PSBfX3Zsdl9yZWdfcmVhZF9md19kb21haW5zKGk5MTVfbW1pb19yZWdfb2Zmc2V0KHJlZykpOwot CQllbHNlCi0JCQlmd19kb21haW5zID0gX19nZW42X3JlZ19yZWFkX2Z3X2RvbWFpbnMoaTkxNV9t bWlvX3JlZ19vZmZzZXQocmVnKSk7Ci0JCWJyZWFrOwotCWRlZmF1bHQ6Ci0JCU1JU1NJTkdfQ0FT RShJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuKTsKLQljYXNlIDU6IC8qIGZvcmNld2FrZSB3YXMg aW50cm9kdWNlZCB3aXRoIGdlbjYgKi8KLQljYXNlIDQ6Ci0JY2FzZSAzOgotCWNhc2UgMjoKLQkJ cmV0dXJuIDA7CisJaWYgKEhBU19GV1RBQkxFKGRldl9wcml2KSkgeworCQlmd19kb21haW5zID0g X19md3RhYmxlX3JlZ19yZWFkX2Z3X2RvbWFpbnMob2Zmc2V0KTsKKwl9IGVsc2UgaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gNikgeworCQlmd19kb21haW5zID0gX19nZW42X3JlZ19yZWFkX2Z3 X2RvbWFpbnMob2Zmc2V0KTsKKwl9IGVsc2UgeworCQlXQVJOX09OKCFJU19HRU4oZGV2X3ByaXYs IDIsIDUpKTsKKwkJZndfZG9tYWlucyA9IDA7CiAJfQogCiAJV0FSTl9PTihmd19kb21haW5zICYg fmRldl9wcml2LT51bmNvcmUuZndfZG9tYWlucyk7CkBAIC0xODY1LDkgKzE4MzUsNiBAQCBpbnRl bF91bmNvcmVfZm9yY2V3YWtlX2Zvcl93cml0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiB7CiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBmd19kb21haW5zOwogCi0JaWYgKGlu dGVsX3ZncHVfYWN0aXZlKGRldl9wcml2KSkKLQkJcmV0dXJuIDA7Ci0KIAlzd2l0Y2ggKElOVEVM X0dFTihkZXZfcHJpdikpIHsKIAljYXNlIDk6CiAJCWZ3X2RvbWFpbnMgPSBfX2dlbjlfcmVnX3dy aXRlX2Z3X2RvbWFpbnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKSk7CkBAIC0xOTE4LDYgKzE4 ODUsOSBAQCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2Zvcl9yZWcoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCiAJV0FSTl9PTighb3ApOwogCisJaWYgKGludGVsX3ZncHVfYWN0 aXZlKGRldl9wcml2KSkKKwkJcmV0dXJuIDA7CisKIAlpZiAob3AgJiBGV19SRUdfUkVBRCkKIAkJ ZndfZG9tYWlucyA9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3JlYWQoZGV2X3ByaXYsIHJl Zyk7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK