From: Tvrtko Ursulin Subject: [PATCH 07/14] drm/i915: Eliminate Gen9 special case Date: Fri, 30 Sep 2016 18:48:42 +0100 Message-ID: <1475257729-11283-8-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 0C7BC6E241 for ; Fri, 30 Sep 2016 17:49:05 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b4so4473486wmb.2 for ; Fri, 30 Sep 2016 10:49:04 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCklmIHdlIGlu c2VydCBibGl0dGVyIGZvcmNld2FrZSBkb21haW4gZW50cmllcyBpbiB0aGUgcmFuZ2UKdGFibGUg d2UgY2FuIGVsaW1pbmF0ZSB0aGF0IHNwZWNpYWwgY2FzZSBhbmQgc2ltcGxpZnkgdGhlCmNvZGUg aW4gYSBmZXcgbWFjcm9zLiBUaGlzIHdpbGwgZW5hYmxlIG1vcmUgdW5pZmljYXRpb24gbGF0ZXIu CgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgNDIgKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIxIGluc2VydGlv bnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5k ZXggNjBmZTc5NmZkZDBjLi4wNGVkMTcyMWM2OWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vu Y29yZS5jCkBAIC02MTMsNyArNjEzLDcgQEAgZmluZF9md19kb21haW4odTMyIG9mZnNldCwgY29u 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 dGVkIGJ5IG9mZnNldCByYW5nZXMhIFNlZSBpbnRlbF9md190YWJsZV9jaGVjaygpLiAqLwogc3Rh dGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX19nZW45X2Z3X3Jhbmdlc1td ID0geworCUdFTl9GV19SQU5HRSgweDAsIDB4YWZmLCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VO X0ZXX1JBTkdFKDB4YjAwLCAweDFmZmYsIDApLCAvKiB1bmNvcmUgcmFuZ2UgKi8KIAlHRU5fRldf UkFOR0UoMHgyMDAwLCAweDI2ZmYsIEZPUkNFV0FLRV9SRU5ERVIpLAorCUdFTl9GV19SQU5HRSgw eDI3MDAsIDB4MmZmZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19SQU5HRSgweDMwMDAs IDB4M2ZmZiwgRk9SQ0VXQUtFX1JFTkRFUiksCisJR0VOX0ZXX1JBTkdFKDB4NDAwMCwgMHg1MWZm LCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4NTIwMCwgMHg3ZmZmLCBGT1JD RVdBS0VfUkVOREVSKSwKKwlHRU5fRldfUkFOR0UoMHg4MDAwLCAweDgxMmYsIEZPUkNFV0FLRV9C TElUVEVSKSwKIAlHRU5fRldfUkFOR0UoMHg4MTMwLCAweDgxM2YsIEZPUkNFV0FLRV9NRURJQSks CiAJR0VOX0ZXX1JBTkdFKDB4ODE0MCwgMHg4MTVmLCBGT1JDRVdBS0VfUkVOREVSKSwKKwlHRU5f RldfUkFOR0UoMHg4MTYwLCAweDgyZmYsIEZPUkNFV0FLRV9CTElUVEVSKSwKIAlHRU5fRldfUkFO R0UoMHg4MzAwLCAweDg0ZmYsIEZPUkNFV0FLRV9SRU5ERVIpLAorCUdFTl9GV19SQU5HRSgweDg1 MDAsIDB4ODdmZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAogCUdFTl9GV19SQU5HRSgweDg4MDAsIDB4 ODlmZiwgRk9SQ0VXQUtFX01FRElBKSwKKwlHRU5fRldfUkFOR0UoMHg4YTAwLCAweDhiZmYsIEZP UkNFV0FLRV9CTElUVEVSKSwKIAlHRU5fRldfUkFOR0UoMHg4YzAwLCAweDhjZmYsIEZPUkNFV0FL RV9SRU5ERVIpLAorCUdFTl9GV19SQU5HRSgweDhkMDAsIDB4OTNmZiwgRk9SQ0VXQUtFX0JMSVRU RVIpLAogCUdFTl9GV19SQU5HRSgweDk0MDAsIDB4OTdmZiwgRk9SQ0VXQUtFX1JFTkRFUiB8IEZP UkNFV0FLRV9NRURJQSksCisJR0VOX0ZXX1JBTkdFKDB4OTgwMCwgMHhhZmZmLCBGT1JDRVdBS0Vf QkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4YjAwMCwgMHhiNDdmLCBGT1JDRVdBS0VfUkVOREVS KSwKKwlHRU5fRldfUkFOR0UoMHhiNDgwLCAweGJmZmYsIEZPUkNFV0FLRV9CTElUVEVSKSwKIAlH RU5fRldfUkFOR0UoMHhkMDAwLCAweGQ3ZmYsIEZPUkNFV0FLRV9NRURJQSksCisJR0VOX0ZXX1JB TkdFKDB4ZDgwMCwgMHhkZmZmLCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4 ZTAwMCwgMHhlOGZmLCBGT1JDRVdBS0VfUkVOREVSKSwKKwlHRU5fRldfUkFOR0UoMHhlOTAwLCAw eDExZmZmLCBGT1JDRVdBS0VfQkxJVFRFUiksCiAJR0VOX0ZXX1JBTkdFKDB4MTIwMDAsIDB4MTNm ZmYsIEZPUkNFV0FLRV9NRURJQSksCisJR0VOX0ZXX1JBTkdFKDB4MTQwMDAsIDB4MTlmZmYsIEZP UkNFV0FLRV9CTElUVEVSKSwKIAlHRU5fRldfUkFOR0UoMHgxYTAwMCwgMHgxZTlmZiwgRk9SQ0VX QUtFX01FRElBKSwKKwlHRU5fRldfUkFOR0UoMHgxZWEwMCwgMHgyNDNmZiwgRk9SQ0VXQUtFX0JM SVRURVIpLAogCUdFTl9GV19SQU5HRSgweDI0NDAwLCAweDI0N2ZmLCBGT1JDRVdBS0VfUkVOREVS KSwKKwlHRU5fRldfUkFOR0UoMHgyNDgwMCwgMHgyZmZmZiwgRk9SQ0VXQUtFX0JMSVRURVIpLAog CUdFTl9GV19SQU5HRSgweDMwMDAwLCAweDNmZmZmLCBGT1JDRVdBS0VfTUVESUEpLAogfTsKIAog I2RlZmluZSBfX2dlbjlfcmVnX3JlYWRfZndfZG9tYWlucyhvZmZzZXQpIFwKICh7IFwKIAllbnVt IGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAotCWlmIChORUVEU19GT1JDRV9XQUtFKChv ZmZzZXQpKSkgeyBcCisJaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpKSBcCiAJCV9fZndk ID0gZmluZF9md19kb21haW4ob2Zmc2V0LCBfX2dlbjlfZndfcmFuZ2VzLCBcCiAJCQkJICAgICAg IEFSUkFZX1NJWkUoX19nZW45X2Z3X3JhbmdlcykpOyBcCi0JCWlmIChfX2Z3ZCA9PSAtMSApIFwK LQkJCV9fZndkID0gRk9SQ0VXQUtFX0JMSVRURVI7IFwKLQl9IFwKIAlfX2Z3ZDsgXAogfSkKIApA QCAtNzkwLDEyICs3OTMsOSBAQCBzdGF0aWMgYm9vbCBpc19nZW45X3NoYWRvd2VkKHUzMiBvZmZz ZXQpCiAjZGVmaW5lIF9fZ2VuOV9yZWdfd3JpdGVfZndfZG9tYWlucyhvZmZzZXQpIFwKICh7IFwK IAllbnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAotCWlmIChORUVEU19GT1JDRV9X QUtFKChvZmZzZXQpKSAmJiAhaXNfZ2VuOV9zaGFkb3dlZChvZmZzZXQpKSB7IFwKKwlpZiAoTkVF RFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkgJiYgIWlzX2dlbjlfc2hhZG93ZWQob2Zmc2V0KSkgXAog CQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKG9mZnNldCwgX19nZW45X2Z3X3JhbmdlcywgXAogCQkJ CSAgICAgICBBUlJBWV9TSVpFKF9fZ2VuOV9md19yYW5nZXMpKTsgXAotCQlpZiAoX19md2QgPT0g LTEgKSBcCi0JCQlfX2Z3ZCA9IEZPUkNFV0FLRV9CTElUVEVSOyBcCi0JfSBcCiAJX19md2Q7IFwK IH0pCiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK