From: Tvrtko Ursulin Subject: [PATCH 08/14] drm/i915: Store the active forcewake range table pointer Date: Mon, 3 Oct 2016 09:39:16 +0100 Message-ID: <1475483956-8246-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475257729-11283-9-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 E102E6E50E for ; Mon, 3 Oct 2016 08:39:25 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id p138so13507526wmb.0 for ; Mon, 03 Oct 2016 01:39:25 -0700 (PDT) In-Reply-To: <1475257729-11283-9-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 bGUuIChDaHJpcyBXaWxzb24pCnYzOiBSZWJhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCAgICAgfCAxMCArKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29y ZS5jIHwgNjggKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAppbmRleCA5YjE5OTdmZDhjODcuLjNiMTQ5MzhhYTA5ZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC01ODIsOSArNTgyLDE5IEBAIHN0cnVjdCBpbnRlbF91bmNvcmVfZnVuY3Mg ewogCQkJCXVpbnQzMl90IHZhbCwgYm9vbCB0cmFjZSk7CiB9OwogCitzdHJ1Y3QgaW50ZWxfZm9y Y2V3YWtlX3JhbmdlIHsKKwl1MzIgc3RhcnQ7CisJdTMyIGVuZDsKKworCWVudW0gZm9yY2V3YWtl X2RvbWFpbnMgZG9tYWluczsKK307CisKIHN0cnVjdCBpbnRlbF91bmNvcmUgewogCXNwaW5sb2Nr X3QgbG9jazsgLyoqIGxvY2sgaXMgYWxzbyB0YWtlbiBpbiBpcnEgY29udGV4dHMuICovCiAKKwlj b25zdCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICpmd19kb21haW5zX3RhYmxlOworCXVu c2lnbmVkIGludCBmd19kb21haW5zX3RhYmxlX2VudHJpZXM7CisKIAlzdHJ1Y3QgaW50ZWxfdW5j b3JlX2Z1bmNzIGZ1bmNzOwogCiAJdW5zaWduZWQgZmlmb19jb3VudDsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMKaW5kZXggYmE5MGE3ZTlkM2IyLi5jODEzYmRlZjhkZWQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC01ODIsMTQgKzU4Miw2IEBAIHZvaWQgYXNzZXJ0 X2ZvcmNld2FrZXNfaW5hY3RpdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CV9fZndkOyBcCiB9KQogCi1zdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlCi17Ci0JdTMyIHN0 YXJ0OwotCXUzMiBlbmQ7Ci0KLQllbnVtIGZvcmNld2FrZV9kb21haW5zIGRvbWFpbnM7Ci19Owot CiBzdGF0aWMgaW50IGZ3X3JhbmdlX2NtcChjb25zdCB2b2lkICprZXksIGNvbnN0IHZvaWQgKmVs dCkKIHsKIAljb25zdCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICplbnRyeSA9IGVsdDsK QEAgLTYwNCwyOCArNTk2LDM4IEBAIHN0YXRpYyBpbnQgZndfcmFuZ2VfY21wKGNvbnN0IHZvaWQg KmtleSwgY29uc3Qgdm9pZCAqZWx0KQogfQogCiBzdGF0aWMgZW51bSBmb3JjZXdha2VfZG9tYWlu cwotZmluZF9md19kb21haW4odTMyIG9mZnNldCwgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2Fr ZV9yYW5nZSAqcmFuZ2VzLAotCSAgICAgICB1bnNpZ25lZCBpbnQgbnVtX3JhbmdlcykKK2ZpbmRf ZndfZG9tYWluKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG9mZnNldCkK IHsKLQlzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICplbnRyeTsKKwljb25zdCBzdHJ1Y3Qg aW50ZWxfZm9yY2V3YWtlX3JhbmdlICp0YWJsZSwgKmVudHJ5OworCXVuc2lnbmVkIGludCBudW1f ZW50cmllczsKIAotCWVudHJ5ID0gYnNlYXJjaCgodm9pZCAqKSh1bnNpZ25lZCBsb25nKW9mZnNl dCwgKGNvbnN0IHZvaWQgKilyYW5nZXMsCi0JCQludW1fcmFuZ2VzLCBzaXplb2Yoc3RydWN0IGlu dGVsX2ZvcmNld2FrZV9yYW5nZSksCisJdGFibGUgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFp bnNfdGFibGU7CisJbnVtX2VudHJpZXMgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnNfdGFi bGVfZW50cmllczsKKworCWVudHJ5ID0gYnNlYXJjaCgodm9pZCAqKSh1bnNpZ25lZCBsb25nKW9m ZnNldCwgKGNvbnN0IHZvaWQgKil0YWJsZSwKKwkJCW51bV9lbnRyaWVzLCBzaXplb2Yoc3RydWN0 IGludGVsX2ZvcmNld2FrZV9yYW5nZSksCiAJCQlmd19yYW5nZV9jbXApOwogCiAJcmV0dXJuIGVu dHJ5ID8gZW50cnktPmRvbWFpbnMgOiAwOwogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfZndfdGFi bGVfY2hlY2soY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSAqcmFuZ2VzLAotCQkg ICAgIHVuc2lnbmVkIGludCBudW1fcmFuZ2VzKQoraW50ZWxfZndfdGFibGVfY2hlY2soc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCWNvbnN0IHN0cnVjdCBpbnRlbF9mb3Jj ZXdha2VfcmFuZ2UgKnJhbmdlczsKKwl1bnNpZ25lZCBpbnQgbnVtX3JhbmdlczsKIAlzMzIgcHJl djsKIAl1bnNpZ25lZCBpbnQgaTsKIAogCWlmICghSVNfRU5BQkxFRChDT05GSUdfRFJNX0k5MTVf REVCVUcpKQogCQlyZXR1cm47CiAKKwlyYW5nZXMgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFp bnNfdGFibGU7CisJaWYgKCFyYW5nZXMpCisJCXJldHVybjsKKworCW51bV9yYW5nZXMgPSBkZXZf cHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnNfdGFibGVfZW50cmllczsKKwogCWZvciAoaSA9IDAsIHBy ZXYgPSAtMTsgaSA8IG51bV9yYW5nZXM7IGkrKywgcmFuZ2VzKyspIHsKIAkJV0FSTl9PTl9PTkNF KHByZXYgPj0gKHMzMilyYW5nZXMtPnN0YXJ0KTsKIAkJcHJldiA9IHJhbmdlcy0+c3RhcnQ7CkBA IC02NTIsOCArNjU0LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFu Z2UgX192bHZfZndfcmFuZ2VzW10gPSB7CiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBf X2Z3ZCA9IDA7IFwKIAlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkpIFwKLQkJX19md2Qg PSBmaW5kX2Z3X2RvbWFpbihvZmZzZXQsIF9fdmx2X2Z3X3JhbmdlcywgXAotCQkJCSAgICAgICBB UlJBWV9TSVpFKF9fdmx2X2Z3X3JhbmdlcykpOyBcCisJCV9fZndkID0gZmluZF9md19kb21haW4o ZGV2X3ByaXYsIG9mZnNldCk7IFwKIAlfX2Z3ZDsgXAogfSkKIApAQCAtNzExLDggKzcxMiw3IEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fY2h2X2Z3X3Jhbmdl c1tdID0gewogKHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19md2QgPSAwOyBcCiAJaWYg KE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpKSBcCi0JCV9fZndkID0gZmluZF9md19kb21haW4o b2Zmc2V0LCBfX2Nodl9md19yYW5nZXMsIFwKLQkJCQkgICAgICAgQVJSQVlfU0laRShfX2Nodl9m d19yYW5nZXMpKTsgXAorCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9wcml2LCBvZmZzZXQp OyBcCiAJX19md2Q7IFwKIH0pCiAKQEAgLTcyMCw4ICs3MjAsNyBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSBfX2Nodl9md19yYW5nZXNbXSA9IHsKICh7IFwKIAll bnVtIGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAogCWlmIChORUVEU19GT1JDRV9XQUtF KChvZmZzZXQpKSAmJiAhaXNfZ2VuOF9zaGFkb3dlZChvZmZzZXQpKSBcCi0JCV9fZndkID0gZmlu ZF9md19kb21haW4ob2Zmc2V0LCBfX2Nodl9md19yYW5nZXMsIFwKLQkJCQkgICAgICAgQVJSQVlf U0laRShfX2Nodl9md19yYW5nZXMpKTsgXAorCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9w cml2LCBvZmZzZXQpOyBcCiAJX19md2Q7IFwKIH0pCiAKQEAgLTc2NSw4ICs3NjQsNyBAQCBzdGF0 aWMgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSBfX2dlbjlfZndfcmFuZ2VzW10g PSB7CiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwKIAlpZiAoTkVF RFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkpIFwKLQkJX19md2QgPSBmaW5kX2Z3X2RvbWFpbihvZmZz ZXQsIF9fZ2VuOV9md19yYW5nZXMsIFwKLQkJCQkgICAgICAgQVJSQVlfU0laRShfX2dlbjlfZndf cmFuZ2VzKSk7IFwKKwkJX19md2QgPSBmaW5kX2Z3X2RvbWFpbihkZXZfcHJpdiwgb2Zmc2V0KTsg XAogCV9fZndkOyBcCiB9KQogCkBAIC03OTQsOCArNzkyLDcgQEAgc3RhdGljIGJvb2wgaXNfZ2Vu OV9zaGFkb3dlZCh1MzIgb2Zmc2V0KQogKHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgX19m d2QgPSAwOyBcCiAJaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpICYmICFpc19nZW45X3No YWRvd2VkKG9mZnNldCkpIFwKLQkJX19md2QgPSBmaW5kX2Z3X2RvbWFpbihvZmZzZXQsIF9fZ2Vu OV9md19yYW5nZXMsIFwKLQkJCQkgICAgICAgQVJSQVlfU0laRShfX2dlbjlfZndfcmFuZ2VzKSk7 IFwKKwkJX19md2QgPSBmaW5kX2Z3X2RvbWFpbihkZXZfcHJpdiwgb2Zmc2V0KTsgXAogCV9fZndk OyBcCiB9KQogCkBAIC0xMzE4LDYgKzEzMTUsMTMgQEAgc3RhdGljIHZvaWQgaW50ZWxfdW5jb3Jl X2Z3X2RvbWFpbnNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJV0FS Tl9PTihkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnMgPT0gMCk7CiB9CiAKKyNkZWZpbmUgQVNT SUdOX0ZXX0RPTUFJTlNfVEFCTEUoZCkgXAoreyBcCisJZGV2X3ByaXYtPnVuY29yZS5md19kb21h aW5zX3RhYmxlID0gXAorCQkJKHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgKikoZCk7IFwK KwlkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnNfdGFibGVfZW50cmllcyA9IEFSUkFZX1NJWkUo KGQpKTsgXAorfQorCiB2b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKIAlpOTE1X2NoZWNrX3ZncHUoZGV2X3ByaXYpOwpAQCAtMTMzMSwx NyArMTMzNSwxMyBAQCB2b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlzd2l0Y2ggKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4pIHsKIAlk ZWZhdWx0OgogCWNhc2UgOToKLQkJaW50ZWxfZndfdGFibGVfY2hlY2soX19nZW45X2Z3X3Jhbmdl cywKLQkJCQkgICAgIEFSUkFZX1NJWkUoX19nZW45X2Z3X3JhbmdlcykpOwotCisJCUFTU0lHTl9G V19ET01BSU5TX1RBQkxFKF9fZ2VuOV9md19yYW5nZXMpOwogCQlBU1NJR05fV1JJVEVfTU1JT19W RlVOQ1MoZ2VuOSk7CiAJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKGdlbjkpOwogCQlicmVhazsK IAljYXNlIDg6CiAJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewotCQkJaW50ZWxfZndf dGFibGVfY2hlY2soX19jaHZfZndfcmFuZ2VzLAotCQkJCQkgICAgIEFSUkFZX1NJWkUoX19jaHZf ZndfcmFuZ2VzKSk7Ci0KKwkJCUFTU0lHTl9GV19ET01BSU5TX1RBQkxFKF9fY2h2X2Z3X3Jhbmdl cyk7CiAJCQlBU1NJR05fV1JJVEVfTU1JT19WRlVOQ1MoY2h2KTsKIAkJCUFTU0lHTl9SRUFEX01N SU9fVkZVTkNTKGNodik7CiAKQEAgLTEzNTUsOSArMTM1NSw3IEBAIHZvaWQgaW50ZWxfdW5jb3Jl X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlBU1NJR05fV1JJVEVf TU1JT19WRlVOQ1MoZ2VuNik7CiAKIAkJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7Ci0J CQlpbnRlbF9md190YWJsZV9jaGVjayhfX3Zsdl9md19yYW5nZXMsCi0JCQkJCSAgICAgQVJSQVlf U0laRShfX3Zsdl9md19yYW5nZXMpKTsKLQorCQkJQVNTSUdOX0ZXX0RPTUFJTlNfVEFCTEUoX192 bHZfZndfcmFuZ2VzKTsKIAkJCUFTU0lHTl9SRUFEX01NSU9fVkZVTkNTKHZsdik7CiAJCX0gZWxz ZSB7CiAJCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyhnZW42KTsKQEAgLTEzNzUsNiArMTM3Myw4 IEBAIHZvaWQgaW50ZWxfdW5jb3JlX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCQlicmVhazsKIAl9CiAKKwlpbnRlbF9md190YWJsZV9jaGVjayhkZXZfcHJpdik7CisK IAlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2X3ByaXYpKSB7CiAJCUFTU0lHTl9XUklURV9NTUlP X1ZGVU5DUyh2Z3B1KTsKIAkJQVNTSUdOX1JFQURfTU1JT19WRlVOQ1ModmdwdSk7Ci0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==