From: Tvrtko Ursulin Subject: [PATCH 08/14] drm/i915: Store the active forcewake range table pointer Date: Fri, 30 Sep 2016 18:48:43 +0100 Message-ID: <1475257729-11283-9-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3D78B6E23F for ; Fri, 30 Sep 2016 17:49:06 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id b4so4473574wmb.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCklmIHdlIHN0 b3JlIHRoaXMgaW4gdGhlIHVuY29yZSBzdHJ1Y3R1cmUgd2UgYXJlIG9uIGEgZ29vZCB3YXkgdG8K c2hvdyBtb3JlIGNvbW1vbmFsaXR5IGJldHdlZW4gdGhlIHBlci1wbGF0Zm9ybSBpbXBsZW1lbnRh dGlvbnMuCgp2MjogQ29uc3RpZnkgdGFibGUgcG9pbnRlciBhbmQgY29ycmVjdCBjb2Rpbmcgc3R5 bGUuIChDaHJpcyBXaWxzb24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv LnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgIHwgMTAgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgNzMg KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0 NiBpbnNlcnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCA5YjE5OTdmZDhjODcuLjNiMTQ5MzhhYTA5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CkBAIC01ODIsOSArNTgyLDE5IEBAIHN0cnVjdCBpbnRlbF91bmNvcmVfZnVuY3MgewogCQkJCXVp bnQzMl90IHZhbCwgYm9vbCB0cmFjZSk7CiB9OwogCitzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3Jh bmdlIHsKKwl1MzIgc3RhcnQ7CisJdTMyIGVuZDsKKworCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMg ZG9tYWluczsKK307CisKIHN0cnVjdCBpbnRlbF91bmNvcmUgewogCXNwaW5sb2NrX3QgbG9jazsg LyoqIGxvY2sgaXMgYWxzbyB0YWtlbiBpbiBpcnEgY29udGV4dHMuICovCiAKKwljb25zdCBzdHJ1 Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICpmd19kb21haW5zX3RhYmxlOworCXVuc2lnbmVkIGlu dCBmd19kb21haW5zX3RhYmxlX2VudHJpZXM7CisKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlX2Z1bmNz IGZ1bmNzOwogCiAJdW5zaWduZWQgZmlmb19jb3VudDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5j b3JlLmMKaW5kZXggMDRlZDE3MjFjNjlmLi4wNTA1OTZmZTkwYzUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCkBAIC01ODIsMTQgKzU4Miw2IEBAIHZvaWQgYXNzZXJ0X2ZvcmNld2Fr ZXNfaW5hY3RpdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCV9fZndkOyBc CiB9KQogCi1zdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlCi17Ci0JdTMyIHN0YXJ0OwotCXUz MiBlbmQ7Ci0KLQllbnVtIGZvcmNld2FrZV9kb21haW5zIGRvbWFpbnM7Ci19OwotCiBzdGF0aWMg aW50IGZ3X3JhbmdlX2NtcChjb25zdCB2b2lkICprZXksIGNvbnN0IHZvaWQgKmVsdCkKIHsKIAlj b25zdCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICplbnRyeSA9IGVsdDsKQEAgLTYwNCwy OCArNTk2LDM3IEBAIHN0YXRpYyBpbnQgZndfcmFuZ2VfY21wKGNvbnN0IHZvaWQgKmtleSwgY29u c3Qgdm9pZCAqZWx0KQogfQogCiBzdGF0aWMgZW51bSBmb3JjZXdha2VfZG9tYWlucwotZmluZF9m d19kb21haW4odTMyIG9mZnNldCwgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSAq cmFuZ2VzLAotCSAgICAgICB1bnNpZ25lZCBpbnQgbnVtX3JhbmdlcykKK2ZpbmRfZndfZG9tYWlu KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG9mZnNldCkKIHsKLQlzdHJ1 Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICplbnRyeTsKKwljb25zdCBzdHJ1Y3QgaW50ZWxfZm9y Y2V3YWtlX3JhbmdlICp0YWJsZSwgKmVudHJ5OworCXVuc2lnbmVkIGludCBudW1fZW50cmllczsK IAotCWVudHJ5ID0gYnNlYXJjaCgodm9pZCAqKSh1bnNpZ25lZCBsb25nKW9mZnNldCwgKGNvbnN0 IHZvaWQgKilyYW5nZXMsCi0JCQludW1fcmFuZ2VzLCBzaXplb2Yoc3RydWN0IGludGVsX2ZvcmNl d2FrZV9yYW5nZSksCisJdGFibGUgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnNfdGFibGU7 CisJbnVtX2VudHJpZXMgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnNfdGFibGVfZW50cmll czsKKworCWVudHJ5ID0gYnNlYXJjaCgodm9pZCAqKSh1bnNpZ25lZCBsb25nKW9mZnNldCwgKGNv bnN0IHZvaWQgKil0YWJsZSwKKwkJCW51bV9lbnRyaWVzLCBzaXplb2Yoc3RydWN0IGludGVsX2Zv cmNld2FrZV9yYW5nZSksCiAJCQlmd19yYW5nZV9jbXApOwogCiAJcmV0dXJuIGVudHJ5ID8gZW50 cnktPmRvbWFpbnMgOiAwOwogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfZndfdGFibGVfY2hlY2so Y29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSAqcmFuZ2VzLAotCQkgICAgIHVuc2ln bmVkIGludCBudW1fcmFuZ2VzKQoraW50ZWxfZndfdGFibGVfY2hlY2soc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewogI2lmZGVmIENPTkZJR19EUk1fSTkxNV9ERUJVRwogCXVu c2lnbmVkIGludCBpOwotCWNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgKmVudHJ5 ID0gcmFuZ2VzOwotCXMzMiBwcmV2ID0gLTE7CisJY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2Fr ZV9yYW5nZSAqZW50cnk7CisJdW5zaWduZWQgaW50IG51bV9yYW5nZXM7CisJczMyIHByZXY7CisK KwllbnRyeSA9IGRldl9wcml2LT51bmNvcmUuZndfZG9tYWluc190YWJsZTsKKwlpZiAoIWVudHJ5 KQorCQlyZXR1cm47CiAKLQlmb3IgKGkgPSAwOyBpIDwgbnVtX3JhbmdlczsgaSsrLCBlbnRyeSsr KSB7CisJbnVtX3JhbmdlcyA9IGRldl9wcml2LT51bmNvcmUuZndfZG9tYWluc190YWJsZV9lbnRy aWVzOworCisJZm9yIChpID0gMCwgcHJldiA9IC0xOyBpIDwgbnVtX3JhbmdlczsgaSsrLCBlbnRy eSsrKSB7CiAJCVdBUk5fT05fT05DRShwcmV2ID49IChzMzIpZW50cnktPnN0YXJ0KTsKIAkJcHJl diA9IGVudHJ5LT5zdGFydDsKIAkJV0FSTl9PTl9PTkNFKHByZXYgPj0gKHMzMillbnRyeS0+ZW5k KTsKQEAgLTY1Miw4ICs2NTMsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2Fr ZV9yYW5nZSBfX3Zsdl9md19yYW5nZXNbXSA9IHsKICh7IFwKIAllbnVtIGZvcmNld2FrZV9kb21h aW5zIF9fZndkID0gMDsgXAogCWlmIChORUVEU19GT1JDRV9XQUtFKChvZmZzZXQpKSkgXAotCQlf X2Z3ZCA9IGZpbmRfZndfZG9tYWluKG9mZnNldCwgX192bHZfZndfcmFuZ2VzLCBcCi0JCQkJICAg ICAgIEFSUkFZX1NJWkUoX192bHZfZndfcmFuZ2VzKSk7IFwKKwkJX19md2QgPSBmaW5kX2Z3X2Rv bWFpbihkZXZfcHJpdiwgb2Zmc2V0KTsgXAogCV9fZndkOyBcCiB9KQogCkBAIC03MTEsOCArNzEx LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX19jaHZfZndf cmFuZ2VzW10gPSB7CiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwK IAlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkpIFwKLQkJX19md2QgPSBmaW5kX2Z3X2Rv bWFpbihvZmZzZXQsIF9fY2h2X2Z3X3JhbmdlcywgXAotCQkJCSAgICAgICBBUlJBWV9TSVpFKF9f Y2h2X2Z3X3JhbmdlcykpOyBcCisJCV9fZndkID0gZmluZF9md19kb21haW4oZGV2X3ByaXYsIG9m ZnNldCk7IFwKIAlfX2Z3ZDsgXAogfSkKIApAQCAtNzIwLDggKzcxOSw3IEBAIHN0YXRpYyBjb25z dCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fY2h2X2Z3X3Jhbmdlc1tdID0gewogKHsg XAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19md2QgPSAwOyBcCiAJaWYgKE5FRURTX0ZPUkNF X1dBS0UoKG9mZnNldCkpICYmICFpc19nZW44X3NoYWRvd2VkKG9mZnNldCkpIFwKLQkJX19md2Qg PSBmaW5kX2Z3X2RvbWFpbihvZmZzZXQsIF9fY2h2X2Z3X3JhbmdlcywgXAotCQkJCSAgICAgICBB UlJBWV9TSVpFKF9fY2h2X2Z3X3JhbmdlcykpOyBcCisJCV9fZndkID0gZmluZF9md19kb21haW4o ZGV2X3ByaXYsIG9mZnNldCk7IFwKIAlfX2Z3ZDsgXAogfSkKIApAQCAtNzY1LDggKzc2Myw3IEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fZ2VuOV9md19yYW5n ZXNbXSA9IHsKICh7IFwKIAllbnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAogCWlm IChORUVEU19GT1JDRV9XQUtFKChvZmZzZXQpKSkgXAotCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWlu KG9mZnNldCwgX19nZW45X2Z3X3JhbmdlcywgXAotCQkJCSAgICAgICBBUlJBWV9TSVpFKF9fZ2Vu OV9md19yYW5nZXMpKTsgXAorCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9wcml2LCBvZmZz ZXQpOyBcCiAJX19md2Q7IFwKIH0pCiAKQEAgLTc5NCw4ICs3OTEsNyBAQCBzdGF0aWMgYm9vbCBp c19nZW45X3NoYWRvd2VkKHUzMiBvZmZzZXQpCiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlu cyBfX2Z3ZCA9IDA7IFwKIAlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkgJiYgIWlzX2dl bjlfc2hhZG93ZWQob2Zmc2V0KSkgXAotCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKG9mZnNldCwg X19nZW45X2Z3X3JhbmdlcywgXAotCQkJCSAgICAgICBBUlJBWV9TSVpFKF9fZ2VuOV9md19yYW5n ZXMpKTsgXAorCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9wcml2LCBvZmZzZXQpOyBcCiAJ X19md2Q7IFwKIH0pCiAKQEAgLTEzMTgsNiArMTMxNCwxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91 bmNvcmVfZndfZG9tYWluc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAlXQVJOX09OKGRldl9wcml2LT51bmNvcmUuZndfZG9tYWlucyA9PSAwKTsKIH0KIAorI2RlZmlu ZSBBU1NJR05fRldfRE9NQUlOU19UQUJMRShkKSBcCit7IFwKKwlkZXZfcHJpdi0+dW5jb3JlLmZ3 X2RvbWFpbnNfdGFibGUgPSBcCisJCQkoc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSAqKShk KTsgXAorCWRldl9wcml2LT51bmNvcmUuZndfZG9tYWluc190YWJsZV9lbnRyaWVzID0gQVJSQVlf U0laRSgoZCkpOyBcCit9CisKIHZvaWQgaW50ZWxfdW5jb3JlX2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewogCWk5MTVfY2hlY2tfdmdwdShkZXZfcHJpdik7CkBAIC0x MzMxLDE3ICsxMzM0LDEzIEBAIHZvaWQgaW50ZWxfdW5jb3JlX2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCXN3aXRjaCAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbikg ewogCWRlZmF1bHQ6CiAJY2FzZSA5OgotCQlpbnRlbF9md190YWJsZV9jaGVjayhfX2dlbjlfZndf cmFuZ2VzLAotCQkJCSAgICAgQVJSQVlfU0laRShfX2dlbjlfZndfcmFuZ2VzKSk7Ci0KKwkJQVNT SUdOX0ZXX0RPTUFJTlNfVEFCTEUoX19nZW45X2Z3X3Jhbmdlcyk7CiAJCUFTU0lHTl9XUklURV9N TUlPX1ZGVU5DUyhnZW45KTsKIAkJQVNTSUdOX1JFQURfTU1JT19WRlVOQ1MoZ2VuOSk7CiAJCWJy ZWFrOwogCWNhc2UgODoKIAkJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Ci0JCQlpbnRl bF9md190YWJsZV9jaGVjayhfX2Nodl9md19yYW5nZXMsCi0JCQkJCSAgICAgQVJSQVlfU0laRShf X2Nodl9md19yYW5nZXMpKTsKLQorCQkJQVNTSUdOX0ZXX0RPTUFJTlNfVEFCTEUoX19jaHZfZndf cmFuZ2VzKTsKIAkJCUFTU0lHTl9XUklURV9NTUlPX1ZGVU5DUyhjaHYpOwogCQkJQVNTSUdOX1JF QURfTU1JT19WRlVOQ1MoY2h2KTsKIApAQCAtMTM1NSw5ICsxMzU0LDcgQEAgdm9pZCBpbnRlbF91 bmNvcmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCUFTU0lHTl9X UklURV9NTUlPX1ZGVU5DUyhnZW42KTsKIAogCQlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikp IHsKLQkJCWludGVsX2Z3X3RhYmxlX2NoZWNrKF9fdmx2X2Z3X3JhbmdlcywKLQkJCQkJICAgICBB UlJBWV9TSVpFKF9fdmx2X2Z3X3JhbmdlcykpOwotCisJCQlBU1NJR05fRldfRE9NQUlOU19UQUJM RShfX3Zsdl9md19yYW5nZXMpOwogCQkJQVNTSUdOX1JFQURfTU1JT19WRlVOQ1Modmx2KTsKIAkJ fSBlbHNlIHsKIAkJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGdlbjYpOwpAQCAtMTM3NSw2ICsx MzcyLDggQEAgdm9pZCBpbnRlbF91bmNvcmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJCWJyZWFrOwogCX0KIAorCWludGVsX2Z3X3RhYmxlX2NoZWNrKGRldl9wcml2 KTsKKwogCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXZfcHJpdikpIHsKIAkJQVNTSUdOX1dSSVRF X01NSU9fVkZVTkNTKHZncHUpOwogCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyh2Z3B1KTsKLS0g CjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK