From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/4] drm/i915: remove potentially confusing IS_G4X checks Date: Fri, 17 Feb 2017 11:22:06 -0200 Message-ID: <1487337727-9813-4-git-send-email-paulo.r.zanoni@intel.com> References: <1487337727-9813-1-git-send-email-paulo.r.zanoni@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00E276ECF1 for ; Fri, 17 Feb 2017 13:22:20 +0000 (UTC) In-Reply-To: <1487337727-9813-1-git-send-email-paulo.r.zanoni@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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org VGhlIElTX0c0WCBtYWNybyBpcyBkZWZpbmVkIGFzIElTX0c0NSB8fCBJU19HTTQ1LiBXZSBoYXZl IHR3byBwb2ludHMKaW4gb3VyIGNvZGUgd2hlcmUgd2UgaGF2ZSBhbiBpZiBzdGF0ZW1lbnQgY2hl Y2tpbmcgZm9yIEdNNDUgZm9sbG93ZWQKYnkgYW4gZWxzZSBpZiBzdGF0ZW1lbnQgY2hlY2tpbmcg Zm9yIElTX0c0WC4gVGhpcyBjYW4gYmUgY29uZnVzaW5nCnNpbmNlIHRoZSBJU19HNFggY2hlY2sg d29uJ3QgYmUgY2F0Y2hpbmcgdGhlIHByZXZpb3VzbHktY2hlY2tlZCBHTTQ1LgpTb21lb25lIHF1 aWNrbHkgdHJ5aW5nIHRvIGNoZWNrIHdoaWNoIGZ1bmN0aW9ucyBydW4gb24gZWFjaCBwbGF0Zm9y bQptYXkgZW5kIHVwIGdldHRpbmcgY29uZnVzZWQgd2hpbGUgcmVhZGluZyB0aGUgY29kZS4KCkZp eCB0aGUgcG90ZW50aWFsIGNvbmZ1c2lvbiBieSBsaW1pdGluZyB0aGUgZWxzZSBpZiBzdGF0ZW1l bnRzIHRvIG9ubHkKY2hlY2sgZm9yIHRoZSBwbGF0Zm9ybSB0aGF0IHdhcyBub3QgYWxyZWFkeSBj aGVja2VkIGVhcmxpZXIgaW4gdGhlIGlmCmxhZGRlci4KClNpZ25lZC1vZmYtYnk6IFBhdWxvIFph bm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2NkY2xrLmMgfCA0ICsrLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y2RjbGsuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKaW5kZXggNmVmYzVm NC4uN2M5MmRjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCkBAIC0yMjMsNyArMjIz LDcgQEAgc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF9ocGxsX3ZjbyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJLyogRklYTUUgb3RoZXIgY2hpcHNldHM/ICovCiAJaWYgKElT X0dNNDUoZGV2X3ByaXYpKQogCQl2Y29fdGFibGUgPSBjdGdfdmNvOwotCWVsc2UgaWYgKElTX0c0 WChkZXZfcHJpdikpCisJZWxzZSBpZiAoSVNfRzQ1KGRldl9wcml2KSkKIAkJdmNvX3RhYmxlID0g ZWxrX3ZjbzsKIAllbHNlIGlmIChJU19JOTY1R00oZGV2X3ByaXYpKQogCQl2Y29fdGFibGUgPSBj bF92Y287CkBAIC0xODA1LDcgKzE4MDUsNyBAQCB2b2lkIGludGVsX2luaXRfY2RjbGtfaG9va3Mo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlkZXZfcHJpdi0+ZGlzcGxheS5n ZXRfY2RjbGsgPSBmaXhlZF80NTBtaHpfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX0dNNDUoZGV2 X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBnbTQ1X2dldF9jZGNsazsK LQllbHNlIGlmIChJU19HNFgoZGV2X3ByaXYpKQorCWVsc2UgaWYgKElTX0c0NShkZXZfcHJpdikp CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGczM19nZXRfY2RjbGs7CiAJZWxzZSBp ZiAoSVNfSTk2NUdNKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0g aTk2NWdtX2dldF9jZGNsazsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK