From: Tvrtko Ursulin Subject: [PATCH 07/13] drm/i915: Eliminate Gen9 special case Date: Thu, 29 Sep 2016 16:35:50 +0100 Message-ID: <1475163356-3463-8-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 6237D6E87A for ; Thu, 29 Sep 2016 15:36:14 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id w84so11289639wmg.0 for ; Thu, 29 Sep 2016 08:36:14 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCklmIHdlIGlu c2VydCBibGl0dGVyIGZvcmNld2FrZSBkb21haW4gZW50cmllcyBpbiB0aGUgcmFuZ2UKdGFibGUg d2UgY2FuIGVsaW1pbmF0ZSB0aGF0IHNwZWNpYWwgY2FzZSBhbmQgc2ltcGxpZnkgdGhlCmNvZGUg aW4gYSBmZXcgbWFjcm9zLiBUaGlzIHdpbGwgZW5hYmxlIG1vcmUgdW5pZmljYXRpb24gbGF0ZXIu CgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgNDIgKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIxIGluc2VydGlv bnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5k ZXggYWU1ZWRhZWExNmY3Li5hNDFhNmEyMDE5YmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vu Y29yZS5jCkBAIC02MTQsNyArNjE0LDcgQEAgZmluZF9md19kb21haW4odTMyIG9mZnNldCwgY29u c3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSAqcmFuZ2VzLAogCQkJbnVtX3Jhbmdlcywg c2l6ZW9mKHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UpLAogCQkJZndfcmFuZ2VfY21wKTsK IAotCXJldHVybiBlbnRyeSA/IGVudHJ5LT5kb21haW5zIDogLTE7CisJcmV0dXJuIGVudHJ5ID8g ZW50cnktPmRvbWFpbnMgOiAwOwogfQogCiBzdGF0aWMgdm9pZApAQCAtNjUxLDEyICs2NTEsOSBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSBfX3Zsdl9md19yYW5n ZXNbXSA9IHsKICNkZWZpbmUgX192bHZfcmVnX3JlYWRfZndfZG9tYWlucyhvZmZzZXQpIFwKICh7 IFwKIAllbnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAotCWlmIChORUVEU19GT1JD RV9XQUtFKChvZmZzZXQpKSkgeyBcCisJaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpKSBc CiAJCV9fZndkID0gZmluZF9md19kb21haW4ob2Zmc2V0LCBfX3Zsdl9md19yYW5nZXMsIFwKIAkJ CQkgICAgICAgQVJSQVlfU0laRShfX3Zsdl9md19yYW5nZXMpKTsgXAotCQlpZiAoX19md2QgPT0g LTEgKSBcCi0JCQlfX2Z3ZCA9IDA7IFwKLQl9IFwKIAlfX2Z3ZDsgXAogfSkKIApAQCAtNzEzLDU3 ICs3MTAsNjMgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX19j aHZfZndfcmFuZ2VzW10gPSB7CiAjZGVmaW5lIF9fY2h2X3JlZ19yZWFkX2Z3X2RvbWFpbnMob2Zm c2V0KSBcCiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwKLQlpZiAo TkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkpIHsgXAorCWlmIChORUVEU19GT1JDRV9XQUtFKChv ZmZzZXQpKSkgXAogCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKG9mZnNldCwgX19jaHZfZndfcmFu Z2VzLCBcCiAJCQkJICAgICAgIEFSUkFZX1NJWkUoX19jaHZfZndfcmFuZ2VzKSk7IFwKLQkJaWYg KF9fZndkID09IC0xICkgXAotCQkJX19md2QgPSAwOyBcCi0JfSBcCiAJX19md2Q7IFwKIH0pCiAK ICNkZWZpbmUgX19jaHZfcmVnX3dyaXRlX2Z3X2RvbWFpbnMob2Zmc2V0KSBcCiAoeyBcCiAJZW51 bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwKLQlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgo b2Zmc2V0KSkgJiYgIWlzX2dlbjhfc2hhZG93ZWQob2Zmc2V0KSkgeyBcCisJaWYgKE5FRURTX0ZP UkNFX1dBS0UoKG9mZnNldCkpICYmICFpc19nZW44X3NoYWRvd2VkKG9mZnNldCkpIFwKIAkJX19m d2QgPSBmaW5kX2Z3X2RvbWFpbihvZmZzZXQsIF9fY2h2X2Z3X3JhbmdlcywgXAogCQkJCSAgICAg ICBBUlJBWV9TSVpFKF9fY2h2X2Z3X3JhbmdlcykpOyBcCi0JCWlmIChfX2Z3ZCA9PSAtMSApIFwK LQkJCV9fZndkID0gMDsgXAotCX0gXAogCV9fZndkOyBcCiB9KQogCiAvKiAqTXVzdCogYmUgc29y dGVkIGJ5IG9mZnNldCByYW5nZXMhICovCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNl d2FrZV9yYW5nZSBfX2dlbjlfZndfcmFuZ2VzW10gPSB7CisJR0VOX0ZXX1JBTkdFKDB4MCwgMHhh ZmYsIEZPUkNFV0FLRV9CTElUVEVSKSwKIAlHRU5fRldfUkFOR0UoMHhiMDAsIDB4MWZmZiwgMCks IC8qIHVuY29yZSByYW5nZSAqLwogCUdFTl9GV19SQU5HRSgweDIwMDAsIDB4MjZmZiwgRk9SQ0VX QUtFX1JFTkRFUiksCisJR0VOX0ZXX1JBTkdFKDB4MjcwMCwgMHgyZmZmLCBGT1JDRVdBS0VfQkxJ VFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4MzAwMCwgMHgzZmZmLCBGT1JDRVdBS0VfUkVOREVSKSwK KwlHRU5fRldfUkFOR0UoMHg0MDAwLCAweDUxZmYsIEZPUkNFV0FLRV9CTElUVEVSKSwKIAlHRU5f RldfUkFOR0UoMHg1MjAwLCAweDdmZmYsIEZPUkNFV0FLRV9SRU5ERVIpLAorCUdFTl9GV19SQU5H RSgweDgwMDAsIDB4ODEyZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19SQU5HRSgweDgx MzAsIDB4ODEzZiwgRk9SQ0VXQUtFX01FRElBKSwKIAlHRU5fRldfUkFOR0UoMHg4MTQwLCAweDgx NWYsIEZPUkNFV0FLRV9SRU5ERVIpLAorCUdFTl9GV19SQU5HRSgweDgxNjAsIDB4ODJmZiwgRk9S Q0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19SQU5HRSgweDgzMDAsIDB4ODRmZiwgRk9SQ0VXQUtF X1JFTkRFUiksCisJR0VOX0ZXX1JBTkdFKDB4ODUwMCwgMHg4N2ZmLCBGT1JDRVdBS0VfQkxJVFRF UiksCiAJR0VOX0ZXX1JBTkdFKDB4ODgwMCwgMHg4OWZmLCBGT1JDRVdBS0VfTUVESUEpLAorCUdF Tl9GV19SQU5HRSgweDhhMDAsIDB4OGJmZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19S QU5HRSgweDhjMDAsIDB4OGNmZiwgRk9SQ0VXQUtFX1JFTkRFUiksCisJR0VOX0ZXX1JBTkdFKDB4 OGQwMCwgMHg5M2ZmLCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4OTQwMCwg MHg5N2ZmLCBGT1JDRVdBS0VfUkVOREVSIHwgRk9SQ0VXQUtFX01FRElBKSwKKwlHRU5fRldfUkFO R0UoMHg5ODAwLCAweGFmZmYsIEZPUkNFV0FLRV9CTElUVEVSKSwKIAlHRU5fRldfUkFOR0UoMHhi MDAwLCAweGI0N2YsIEZPUkNFV0FLRV9SRU5ERVIpLAorCUdFTl9GV19SQU5HRSgweGI0ODAsIDB4 YmZmZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19SQU5HRSgweGQwMDAsIDB4ZDdmZiwg Rk9SQ0VXQUtFX01FRElBKSwKKwlHRU5fRldfUkFOR0UoMHhkODAwLCAweGRmZmYsIEZPUkNFV0FL RV9CTElUVEVSKSwKIAlHRU5fRldfUkFOR0UoMHhlMDAwLCAweGU4ZmYsIEZPUkNFV0FLRV9SRU5E RVIpLAorCUdFTl9GV19SQU5HRSgweGU5MDAsIDB4MTFmZmYsIEZPUkNFV0FLRV9CTElUVEVSKSwK IAlHRU5fRldfUkFOR0UoMHgxMjAwMCwgMHgxM2ZmZiwgRk9SQ0VXQUtFX01FRElBKSwKKwlHRU5f RldfUkFOR0UoMHgxNDAwMCwgMHgxOWZmZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19S QU5HRSgweDFhMDAwLCAweDFlOWZmLCBGT1JDRVdBS0VfTUVESUEpLAorCUdFTl9GV19SQU5HRSgw eDFlYTAwLCAweDI0M2ZmLCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4MjQ0 MDAsIDB4MjQ3ZmYsIEZPUkNFV0FLRV9SRU5ERVIpLAorCUdFTl9GV19SQU5HRSgweDI0ODAwLCAw eDJmZmZmLCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4MzAwMDAsIDB4M2Zm ZmYsIEZPUkNFV0FLRV9NRURJQSksCiB9OwogCiAjZGVmaW5lIF9fZ2VuOV9yZWdfcmVhZF9md19k b21haW5zKG9mZnNldCkgXAogKHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19md2QgPSAw OyBcCi0JaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpKSB7IFwKKwlpZiAoTkVFRFNfRk9S Q0VfV0FLRSgob2Zmc2V0KSkpIFwKIAkJX19md2QgPSBmaW5kX2Z3X2RvbWFpbihvZmZzZXQsIF9f Z2VuOV9md19yYW5nZXMsIFwKIAkJCQkgICAgICAgQVJSQVlfU0laRShfX2dlbjlfZndfcmFuZ2Vz KSk7IFwKLQkJaWYgKF9fZndkID09IC0xICkgXAotCQkJX19md2QgPSBGT1JDRVdBS0VfQkxJVFRF UjsgXAotCX0gXAogCV9fZndkOyBcCiB9KQogCkBAIC03OTAsMTIgKzc5Myw5IEBAIHN0YXRpYyBi b29sIGlzX2dlbjlfc2hhZG93ZWQodTMyIG9mZnNldCkKICNkZWZpbmUgX19nZW45X3JlZ193cml0 ZV9md19kb21haW5zKG9mZnNldCkgXAogKHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19m d2QgPSAwOyBcCi0JaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpICYmICFpc19nZW45X3No YWRvd2VkKG9mZnNldCkpIHsgXAorCWlmIChORUVEU19GT1JDRV9XQUtFKChvZmZzZXQpKSAmJiAh aXNfZ2VuOV9zaGFkb3dlZChvZmZzZXQpKSBcCiAJCV9fZndkID0gZmluZF9md19kb21haW4ob2Zm c2V0LCBfX2dlbjlfZndfcmFuZ2VzLCBcCiAJCQkJICAgICAgIEFSUkFZX1NJWkUoX19nZW45X2Z3 X3JhbmdlcykpOyBcCi0JCWlmIChfX2Z3ZCA9PSAtMSApIFwKLQkJCV9fZndkID0gRk9SQ0VXQUtF X0JMSVRURVI7IFwKLQl9IFwKIAlfX2Z3ZDsgXAogfSkKIAotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=