From: Tvrtko Ursulin Subject: [PATCH 08/13] drm/i915: Store the active forcewake range table pointer Date: Thu, 29 Sep 2016 16:35:51 +0100 Message-ID: <1475163356-3463-9-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35EA46E87A for ; Thu, 29 Sep 2016 15:36:15 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id w72so2683602wmf.1 for ; Thu, 29 Sep 2016 08:36:15 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCklmIHdlIHN0 b3JlIHRoaXMgaW4gdGhlIHVuY29yZSBzdHJ1Y3R1cmUgd2UgYXJlIG9uIGEgZ29vZCB3YXkgdG8K c2hvdyBtb3JlIGNvbW1vbmFsaXR5IGJldHdlZW4gdGhlIHBlci1wbGF0Zm9ybSBpbXBsZW1lbnRh dGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgMTEgKysr KysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDc0ICsrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9u cygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNGNkNzI3 Mzc2ZDFkLi43YzhiZDA3NzY3ZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNTgyLDkg KzU4MiwyMCBAQCBzdHJ1Y3QgaW50ZWxfdW5jb3JlX2Z1bmNzIHsKIAkJCQl1aW50MzJfdCB2YWws IGJvb2wgdHJhY2UpOwogfTsKIAorc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZQoreworCXUz MiBzdGFydDsKKwl1MzIgZW5kOworCisJZW51bSBmb3JjZXdha2VfZG9tYWlucyBkb21haW5zOwor fTsKKwogc3RydWN0IGludGVsX3VuY29yZSB7CiAJc3BpbmxvY2tfdCBsb2NrOyAvKiogbG9jayBp cyBhbHNvIHRha2VuIGluIGlycSBjb250ZXh0cy4gKi8KIAorCXN0cnVjdCBpbnRlbF9mb3JjZXdh a2VfcmFuZ2UgKmZ3X2RvbWFpbnNfdGFibGU7CisJdW5zaWduZWQgaW50IGZ3X2RvbWFpbnNfdGFi bGVfZW50cmllczsKKwogCXN0cnVjdCBpbnRlbF91bmNvcmVfZnVuY3MgZnVuY3M7CiAKIAl1bnNp Z25lZCBmaWZvX2NvdW50OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBhNDFh NmEyMDE5YmUuLjIxOTdjMGE0M2RkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK QEAgLTU4MiwxNCArNTgyLDYgQEAgdm9pZCBhc3NlcnRfZm9yY2V3YWtlc19pbmFjdGl2ZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJX19md2Q7IFwKIH0pCiAKLXN0cnVjdCBp bnRlbF9mb3JjZXdha2VfcmFuZ2UKLXsKLQl1MzIgc3RhcnQ7Ci0JdTMyIGVuZDsKLQotCWVudW0g Zm9yY2V3YWtlX2RvbWFpbnMgZG9tYWluczsKLX07Ci0KIHN0YXRpYyBpbnQgZndfcmFuZ2VfY21w KGNvbnN0IHZvaWQgKmtleSwgY29uc3Qgdm9pZCAqZWx0KQogewogCXN0cnVjdCBpbnRlbF9mb3Jj ZXdha2VfcmFuZ2UgKmVudHJ5ID0KQEAgLTYwNSwyOCArNTk3LDM2IEBAIHN0YXRpYyBpbnQgZndf cmFuZ2VfY21wKGNvbnN0IHZvaWQgKmtleSwgY29uc3Qgdm9pZCAqZWx0KQogfQogCiBzdGF0aWMg ZW51bSBmb3JjZXdha2VfZG9tYWlucwotZmluZF9md19kb21haW4odTMyIG9mZnNldCwgY29uc3Qg c3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSAqcmFuZ2VzLAotCSAgICAgICB1bnNpZ25lZCBp bnQgbnVtX3JhbmdlcykKK2ZpbmRfZndfZG9tYWluKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgdTMyIG9mZnNldCkKIHsKLQlzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICpl bnRyeTsKKwlzdHJ1Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICp0YWJsZSwgKmVudHJ5OworCXVu c2lnbmVkIGludCBudW1fZW50cmllczsKIAotCWVudHJ5ID0gYnNlYXJjaCgodm9pZCAqKSh1bnNp Z25lZCBsb25nKW9mZnNldCwgKGNvbnN0IHZvaWQgKilyYW5nZXMsCi0JCQludW1fcmFuZ2VzLCBz aXplb2Yoc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSksCisJdGFibGUgPSBkZXZfcHJpdi0+ dW5jb3JlLmZ3X2RvbWFpbnNfdGFibGU7CisJbnVtX2VudHJpZXMgPSBkZXZfcHJpdi0+dW5jb3Jl LmZ3X2RvbWFpbnNfdGFibGVfZW50cmllczsKKworCWVudHJ5ID0gYnNlYXJjaCgodm9pZCAqKSh1 bnNpZ25lZCBsb25nKW9mZnNldCwgKGNvbnN0IHZvaWQgKil0YWJsZSwKKwkJCW51bV9lbnRyaWVz LCBzaXplb2Yoc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5nZSksCiAJCQlmd19yYW5nZV9jbXAp OwogCiAJcmV0dXJuIGVudHJ5ID8gZW50cnktPmRvbWFpbnMgOiAwOwogfQogCiBzdGF0aWMgdm9p ZAotaW50ZWxfZndfdGFibGVfY2hlY2soY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2FrZV9yYW5n ZSAqcmFuZ2VzLAotCQkgICAgIHVuc2lnbmVkIGludCBudW1fcmFuZ2VzKQoraW50ZWxfZndfdGFi bGVfY2hlY2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXVuc2lnbmVk IGludCBpOwotCXN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgKmVudHJ5ID0KLQkJKHN0cnVj dCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgKilyYW5nZXM7Ci0JczMyIHByZXYgPSAtMTsKKwlzdHJ1 Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlICplbnRyeTsKKwl1bnNpZ25lZCBpbnQgbnVtX3Jhbmdl czsKKwlzMzIgcHJldjsKIAotCWZvciAoaSA9IDA7IGkgPCBudW1fcmFuZ2VzOyBpKyssIGVudHJ5 KyspIHsKKwllbnRyeSA9IGRldl9wcml2LT51bmNvcmUuZndfZG9tYWluc190YWJsZTsKKwlpZiAo IWVudHJ5KQorCQlyZXR1cm47CisKKwludW1fcmFuZ2VzID0gZGV2X3ByaXYtPnVuY29yZS5md19k b21haW5zX3RhYmxlX2VudHJpZXM7CisKKwlmb3IgKGkgPSAwLCBwcmV2ID0gLTE7IGkgPCBudW1f cmFuZ2VzOyBpKyssIGVudHJ5KyspIHsKIAkJV0FSTl9PTl9PTkNFKHByZXYgPj0gKHMzMillbnRy eS0+c3RhcnQpOwogCQlwcmV2ID0gZW50cnktPnN0YXJ0OwogCQlXQVJOX09OX09OQ0UocHJldiA+ PSAoczMyKWVudHJ5LT5lbmQpOwpAQCAtNjUyLDggKzY1Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgaW50ZWxfZm9yY2V3YWtlX3JhbmdlIF9fdmx2X2Z3X3Jhbmdlc1tdID0gewogKHsgXAogCWVu dW0gZm9yY2V3YWtlX2RvbWFpbnMgX19md2QgPSAwOyBcCiAJaWYgKE5FRURTX0ZPUkNFX1dBS0Uo KG9mZnNldCkpKSBcCi0JCV9fZndkID0gZmluZF9md19kb21haW4ob2Zmc2V0LCBfX3Zsdl9md19y YW5nZXMsIFwKLQkJCQkgICAgICAgQVJSQVlfU0laRShfX3Zsdl9md19yYW5nZXMpKTsgXAorCQlf X2Z3ZCA9IGZpbmRfZndfZG9tYWluKGRldl9wcml2LCBvZmZzZXQpOyBcCiAJX19md2Q7IFwKIH0p CiAKQEAgLTcxMSw4ICs3MTAsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2ZvcmNld2Fr ZV9yYW5nZSBfX2Nodl9md19yYW5nZXNbXSA9IHsKICh7IFwKIAllbnVtIGZvcmNld2FrZV9kb21h aW5zIF9fZndkID0gMDsgXAogCWlmIChORUVEU19GT1JDRV9XQUtFKChvZmZzZXQpKSkgXAotCQlf X2Z3ZCA9IGZpbmRfZndfZG9tYWluKG9mZnNldCwgX19jaHZfZndfcmFuZ2VzLCBcCi0JCQkJICAg ICAgIEFSUkFZX1NJWkUoX19jaHZfZndfcmFuZ2VzKSk7IFwKKwkJX19md2QgPSBmaW5kX2Z3X2Rv bWFpbihkZXZfcHJpdiwgb2Zmc2V0KTsgXAogCV9fZndkOyBcCiB9KQogCkBAIC03MjAsOCArNzE4 LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFuZ2UgX19jaHZfZndf cmFuZ2VzW10gPSB7CiAoeyBcCiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBfX2Z3ZCA9IDA7IFwK IAlpZiAoTkVFRFNfRk9SQ0VfV0FLRSgob2Zmc2V0KSkgJiYgIWlzX2dlbjhfc2hhZG93ZWQob2Zm c2V0KSkgXAotCQlfX2Z3ZCA9IGZpbmRfZndfZG9tYWluKG9mZnNldCwgX19jaHZfZndfcmFuZ2Vz LCBcCi0JCQkJICAgICAgIEFSUkFZX1NJWkUoX19jaHZfZndfcmFuZ2VzKSk7IFwKKwkJX19md2Qg PSBmaW5kX2Z3X2RvbWFpbihkZXZfcHJpdiwgb2Zmc2V0KTsgXAogCV9fZndkOyBcCiB9KQogCkBA IC03NjUsOCArNzYyLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9mb3JjZXdha2VfcmFu Z2UgX19nZW45X2Z3X3Jhbmdlc1tdID0gewogKHsgXAogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMg X19md2QgPSAwOyBcCiAJaWYgKE5FRURTX0ZPUkNFX1dBS0UoKG9mZnNldCkpKSBcCi0JCV9fZndk ID0gZmluZF9md19kb21haW4ob2Zmc2V0LCBfX2dlbjlfZndfcmFuZ2VzLCBcCi0JCQkJICAgICAg IEFSUkFZX1NJWkUoX19nZW45X2Z3X3JhbmdlcykpOyBcCisJCV9fZndkID0gZmluZF9md19kb21h aW4oZGV2X3ByaXYsIG9mZnNldCk7IFwKIAlfX2Z3ZDsgXAogfSkKIApAQCAtNzk0LDggKzc5MCw3 IEBAIHN0YXRpYyBib29sIGlzX2dlbjlfc2hhZG93ZWQodTMyIG9mZnNldCkKICh7IFwKIAllbnVt IGZvcmNld2FrZV9kb21haW5zIF9fZndkID0gMDsgXAogCWlmIChORUVEU19GT1JDRV9XQUtFKChv ZmZzZXQpKSAmJiAhaXNfZ2VuOV9zaGFkb3dlZChvZmZzZXQpKSBcCi0JCV9fZndkID0gZmluZF9m d19kb21haW4ob2Zmc2V0LCBfX2dlbjlfZndfcmFuZ2VzLCBcCi0JCQkJICAgICAgIEFSUkFZX1NJ WkUoX19nZW45X2Z3X3JhbmdlcykpOyBcCisJCV9fZndkID0gZmluZF9md19kb21haW4oZGV2X3By aXYsIG9mZnNldCk7IFwKIAlfX2Z3ZDsgXAogfSkKIApAQCAtMTMxOCw2ICsxMzEzLDEzIEBAIHN0 YXRpYyB2b2lkIGludGVsX3VuY29yZV9md19kb21haW5zX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCVdBUk5fT04oZGV2X3ByaXYtPnVuY29yZS5md19kb21haW5zID09 IDApOwogfQogCisjZGVmaW5lIEFTU0lHTl9GV19ET01BSU5TX1RBQkxFKGQpIFwKK3sgXAorCWRl dl9wcml2LT51bmNvcmUuZndfZG9tYWluc190YWJsZSA9IFwKKwkJCShzdHJ1Y3QgaW50ZWxfZm9y Y2V3YWtlX3JhbmdlICopKGQpOyBcCisJZGV2X3ByaXYtPnVuY29yZS5md19kb21haW5zX3RhYmxl X2VudHJpZXMgPSBBUlJBWV9TSVpFKChkKSk7IFwKK30KKwogdm9pZCBpbnRlbF91bmNvcmVfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaTkxNV9jaGVja192Z3B1 KGRldl9wcml2KTsKQEAgLTEzMzEsMTcgKzEzMzMsMTMgQEAgdm9pZCBpbnRlbF91bmNvcmVfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3dpdGNoIChJTlRFTF9JTkZP KGRldl9wcml2KS0+Z2VuKSB7CiAJZGVmYXVsdDoKIAljYXNlIDk6Ci0JCWludGVsX2Z3X3RhYmxl X2NoZWNrKF9fZ2VuOV9md19yYW5nZXMsCi0JCQkJICAgICBBUlJBWV9TSVpFKF9fZ2VuOV9md19y YW5nZXMpKTsKLQorCQlBU1NJR05fRldfRE9NQUlOU19UQUJMRShfX2dlbjlfZndfcmFuZ2VzKTsK IAkJQVNTSUdOX1dSSVRFX01NSU9fVkZVTkNTKGdlbjkpOwogCQlBU1NJR05fUkVBRF9NTUlPX1ZG VU5DUyhnZW45KTsKIAkJYnJlYWs7CiAJY2FzZSA4OgogCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikpIHsKLQkJCWludGVsX2Z3X3RhYmxlX2NoZWNrKF9fY2h2X2Z3X3JhbmdlcywKLQkJCQkJ ICAgICBBUlJBWV9TSVpFKF9fY2h2X2Z3X3JhbmdlcykpOwotCisJCQlBU1NJR05fRldfRE9NQUlO U19UQUJMRShfX2Nodl9md19yYW5nZXMpOwogCQkJQVNTSUdOX1dSSVRFX01NSU9fVkZVTkNTKGNo dik7CiAJCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyhjaHYpOwogCkBAIC0xMzU1LDkgKzEzNTMs NyBAQCB2b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAkJQVNTSUdOX1dSSVRFX01NSU9fVkZVTkNTKGdlbjYpOwogCiAJCWlmIChJU19WQUxM RVlWSUVXKGRldl9wcml2KSkgewotCQkJaW50ZWxfZndfdGFibGVfY2hlY2soX192bHZfZndfcmFu Z2VzLAotCQkJCQkgICAgIEFSUkFZX1NJWkUoX192bHZfZndfcmFuZ2VzKSk7Ci0KKwkJCUFTU0lH Tl9GV19ET01BSU5TX1RBQkxFKF9fdmx2X2Z3X3Jhbmdlcyk7CiAJCQlBU1NJR05fUkVBRF9NTUlP X1ZGVU5DUyh2bHYpOwogCQl9IGVsc2UgewogCQkJQVNTSUdOX1JFQURfTU1JT19WRlVOQ1MoZ2Vu Nik7CkBAIC0xMzc1LDYgKzEzNzEsOCBAQCB2b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJYnJlYWs7CiAJfQogCisJaW50ZWxfZndfdGFi bGVfY2hlY2soZGV2X3ByaXYpOworCiAJaWYgKGludGVsX3ZncHVfYWN0aXZlKGRldl9wcml2KSkg ewogCQlBU1NJR05fV1JJVEVfTU1JT19WRlVOQ1ModmdwdSk7CiAJCUFTU0lHTl9SRUFEX01NSU9f VkZVTkNTKHZncHUpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=