From: Tvrtko Ursulin Subject: [PATCH 09/13] drm/i915: Remove identical macros Date: Thu, 29 Sep 2016 16:35:52 +0100 Message-ID: <1475163356-3463-10-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id D41B36E87B for ; Thu, 29 Sep 2016 15:36:15 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id b4so11348185wmb.2 for ; Thu, 29 Sep 2016 08:36:15 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlbW92ZSBz b21lIG1hY3JvcyB3aGljaCBhcmUgbm93IG9idmlvdXNseSBpZGVudGljYWwuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgMzAgKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDIxOTdjMGE0M2RkYS4uYTRj ZTM1NzZmOGQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtNjQ4LDcgKzY0 OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fdmx2X2Z3 X3Jhbmdlc1tdID0gewogCUdFTl9GV19SQU5HRSgweDMwMDAwLCAweDNmZmZmLCBGT1JDRVdBS0Vf TUVESUEpLAogfTsKIAotI2RlZmluZSBfX3Zsdl9yZWdfcmVhZF9md19kb21haW5zKG9mZnNldCkg XAorI2RlZmluZSBfX2Z3dGFibGVfcmVnX3JlYWRfZndfZG9tYWlucyhvZmZzZXQpIFwKICh7IFwK IAllbnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAogCWlmIChORUVEU19GT1JDRV9X QUtFKChvZmZzZXQpKSkgXApAQCAtNzA2LDE0ICs3MDYsNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IGludGVsX2ZvcmNld2FrZV9yYW5nZSBfX2Nodl9md19yYW5nZXNbXSA9IHsKIAlHRU5fRldfUkFO R0UoMHgzMDAwMCwgMHgzN2ZmZiwgRk9SQ0VXQUtFX01FRElBKSwKIH07CiAKLSNkZWZpbmUgX19j aHZfcmVnX3JlYWRfZndfZG9tYWlucyhvZmZzZXQpIFwKLSh7IFwKLQllbnVtIGZvcmNld2FrZV9k b21haW5zIF9fZndkID0gMDsgXAotCWlmIChORUVEU19GT1JDRV9XQUtFKChvZmZzZXQpKSkgXAot CQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9wcml2LCBvZmZzZXQpOyBcCi0JX19md2Q7IFwK LX0pCi0KICNkZWZpbmUgX19jaHZfcmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KSBcCiAoeyBc CiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwKQEAgLTc1OCwxNCArNzUwLDYg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX19nZW45X2Z3X3Jh bmdlc1tdID0gewogCUdFTl9GV19SQU5HRSgweDMwMDAwLCAweDNmZmZmLCBGT1JDRVdBS0VfTUVE SUEpLAogfTsKIAotI2RlZmluZSBfX2dlbjlfcmVnX3JlYWRfZndfZG9tYWlucyhvZmZzZXQpIFwK LSh7IFwKLQllbnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAotCWlmIChORUVEU19G T1JDRV9XQUtFKChvZmZzZXQpKSkgXAotCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9wcml2 LCBvZmZzZXQpOyBcCi0JX19md2Q7IFwKLX0pCi0KIHN0YXRpYyBjb25zdCBpOTE1X3JlZ190IGdl bjlfc2hhZG93ZWRfcmVnc1tdID0gewogCVJJTkdfVEFJTChSRU5ERVJfUklOR19CQVNFKSwKIAlS SU5HX1RBSUwoR0VONl9CU0RfUklOR19CQVNFKSwKQEAgLTkyNiw3ICs5MTAsNyBAQCBzdGF0aWMg dSMjeCBcCiB2bHZfcmVhZCMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGk5 MTVfcmVnX3QgcmVnLCBib29sIHRyYWNlKSB7IFwKIAllbnVtIGZvcmNld2FrZV9kb21haW5zIGZ3 X2VuZ2luZTsgXAogCUdFTjZfUkVBRF9IRUFERVIoeCk7IFwKLQlmd19lbmdpbmUgPSBfX3Zsdl9y ZWdfcmVhZF9md19kb21haW5zKG9mZnNldCk7IFwKKwlmd19lbmdpbmUgPSBfX2Z3dGFibGVfcmVn X3JlYWRfZndfZG9tYWlucyhvZmZzZXQpOyBcCiAJaWYgKGZ3X2VuZ2luZSkgXAogCQlfX2ZvcmNl X3dha2VfYXV0byhkZXZfcHJpdiwgZndfZW5naW5lKTsgXAogCXZhbCA9IF9fcmF3X2k5MTVfcmVh ZCMjeChkZXZfcHJpdiwgcmVnKTsgXApAQCAtOTM4LDcgKzkyMiw3IEBAIHN0YXRpYyB1IyN4IFwK IGNodl9yZWFkIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdf dCByZWcsIGJvb2wgdHJhY2UpIHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5l OyBcCiAJR0VONl9SRUFEX0hFQURFUih4KTsgXAotCWZ3X2VuZ2luZSA9IF9fY2h2X3JlZ19yZWFk X2Z3X2RvbWFpbnMob2Zmc2V0KTsgXAorCWZ3X2VuZ2luZSA9IF9fZnd0YWJsZV9yZWdfcmVhZF9m d19kb21haW5zKG9mZnNldCk7IFwKIAlpZiAoZndfZW5naW5lKSBcCiAJCV9fZm9yY2Vfd2FrZV9h dXRvKGRldl9wcml2LCBmd19lbmdpbmUpOyBcCiAJdmFsID0gX19yYXdfaTkxNV9yZWFkIyN4KGRl dl9wcml2LCByZWcpOyBcCkBAIC05NTAsNyArOTM0LDcgQEAgc3RhdGljIHUjI3ggXAogZ2VuOV9y ZWFkIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdfdCByZWcs IGJvb2wgdHJhY2UpIHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5lOyBcCiAJ R0VONl9SRUFEX0hFQURFUih4KTsgXAotCWZ3X2VuZ2luZSA9IF9fZ2VuOV9yZWdfcmVhZF9md19k b21haW5zKG9mZnNldCk7IFwKKwlmd19lbmdpbmUgPSBfX2Z3dGFibGVfcmVnX3JlYWRfZndfZG9t YWlucyhvZmZzZXQpOyBcCiAJaWYgKGZ3X2VuZ2luZSkgXAogCQlfX2ZvcmNlX3dha2VfYXV0byhk ZXZfcHJpdiwgZndfZW5naW5lKTsgXAogCXZhbCA9IF9fcmF3X2k5MTVfcmVhZCMjeChkZXZfcHJp diwgcmVnKTsgXApAQCAtMTgyOSwxOCArMTgxMywxOCBAQCBpbnRlbF91bmNvcmVfZm9yY2V3YWtl X2Zvcl9yZWFkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCXN3aXRjaCAo SU5URUxfR0VOKGRldl9wcml2KSkgewogCWNhc2UgOToKLQkJZndfZG9tYWlucyA9IF9fZ2VuOV9y ZWdfcmVhZF9md19kb21haW5zKGk5MTVfbW1pb19yZWdfb2Zmc2V0KHJlZykpOworCQlmd19kb21h aW5zID0gX19md3RhYmxlX3JlZ19yZWFkX2Z3X2RvbWFpbnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQo cmVnKSk7CiAJCWJyZWFrOwogCWNhc2UgODoKIAkJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYp KQotCQkJZndfZG9tYWlucyA9IF9fY2h2X3JlZ19yZWFkX2Z3X2RvbWFpbnMoaTkxNV9tbWlvX3Jl Z19vZmZzZXQocmVnKSk7CisJCQlmd19kb21haW5zID0gX19md3RhYmxlX3JlZ19yZWFkX2Z3X2Rv bWFpbnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKSk7CiAJCWVsc2UKIAkJCWZ3X2RvbWFpbnMg PSBfX2dlbjZfcmVnX3JlYWRfZndfZG9tYWlucyhpOTE1X21taW9fcmVnX29mZnNldChyZWcpKTsK IAkJYnJlYWs7CiAJY2FzZSA3OgogCWNhc2UgNjoKIAkJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3By aXYpKQotCQkJZndfZG9tYWlucyA9IF9fdmx2X3JlZ19yZWFkX2Z3X2RvbWFpbnMoaTkxNV9tbWlv X3JlZ19vZmZzZXQocmVnKSk7CisJCQlmd19kb21haW5zID0gX19md3RhYmxlX3JlZ19yZWFkX2Z3 X2RvbWFpbnMoaTkxNV9tbWlvX3JlZ19vZmZzZXQocmVnKSk7CiAJCWVsc2UKIAkJCWZ3X2RvbWFp bnMgPSBfX2dlbjZfcmVnX3JlYWRfZndfZG9tYWlucyhpOTE1X21taW9fcmVnX29mZnNldChyZWcp KTsKIAkJYnJlYWs7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==