From: Jani Nikula Subject: [PATCH v2] drm/i915/quirks: pass dev_priv instead of drm dev to quirk code Date: Wed, 17 Oct 2018 12:35:39 +0300 Message-ID: <20181017093539.5468-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 488286E2D5 for ; Wed, 17 Oct 2018 09:35:59 +0000 (UTC) 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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org UGFzcyB0aGUgdHlwZSB3ZSB3YW50IHRvIHNpbXBsaWZ5LiBObyBmdW5jdGlvbmFsIGNoYW5nZXMu Cgp2Mjogcy9kZXZfcHJpdi9pOTE1L2cgKENocmlzKQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8 ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcXVpcmtzLmMgIHwgMzkgKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDI1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzOTk5 ZDAyY2QxOGMuLjhiNTY5ZTE3NjYyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMTQ5MTQsNyArMTQ5MTQsNyBAQCBpbnQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJSU5JVF9XT1JLKCZkZXZfcHJpdi0+YXRvbWljX2hlbHBlci5mcmVl X3dvcmssCiAJCSAgaW50ZWxfYXRvbWljX2hlbHBlcl9mcmVlX3N0YXRlX3dvcmtlcik7CiAKLQlp bnRlbF9pbml0X3F1aXJrcyhkZXYpOworCWludGVsX2luaXRfcXVpcmtzKGRldl9wcml2KTsKIAog CWludGVsX2luaXRfcG0oZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4 IGI1ZDZmNjg4N2MxMy4uMGU5YTkyNmZjYTA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApA QCAtMTk4Miw3ICsxOTgyLDcgQEAgaW50IGludGVsX3Bzcl93YWl0X2Zvcl9pZGxlKGNvbnN0IHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSwKIAkJCSAgICB1MzIgKm91dF92 YWx1ZSk7CiAKIC8qIGludGVsX3F1aXJrcy5jICovCi12b2lkIGludGVsX2luaXRfcXVpcmtzKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordm9pZCBpbnRlbF9pbml0X3F1aXJrcyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCiAvKiBpbnRlbF9ydW50aW1lX3BtLmMgKi8KIGlu dCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9xdWlya3MuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3F1aXJrcy5jCmluZGV4IGE0MWRkNTUyZTM5OS4uZWMyYjBmYzky YjhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9xdWlya3MuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9xdWlya3MuYwpAQCAtMTAsMTAgKzEwLDkgQEAK IC8qCiAgKiBTb21lIG1hY2hpbmVzIChMZW5vdm8gVTE2MCkgZG8gbm90IHdvcmsgd2l0aCBTU0Mg b24gTFZEUyBmb3Igc29tZSByZWFzb24KICAqLwotc3RhdGljIHZvaWQgcXVpcmtfc3NjX2ZvcmNl X2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIHF1aXJrX3NzY19m b3JjZV9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlkZXZfcHJpdi0+cXVp cmtzIHw9IFFVSVJLX0xWRFNfU1NDX0RJU0FCTEU7CisJaTkxNS0+cXVpcmtzIHw9IFFVSVJLX0xW RFNfU1NDX0RJU0FCTEU7CiAJRFJNX0lORk8oImFwcGx5aW5nIGx2ZHMgU1NDIGRpc2FibGUgcXVp cmtcbiIpOwogfQogCkBAIC0yMSwyOSArMjAsMjUgQEAgc3RhdGljIHZvaWQgcXVpcmtfc3NjX2Zv cmNlX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIEEgbWFjaGluZSAoZS5nLiBB Y2VyIEFzcGlyZSA1NzM0WikgbWF5IG5lZWQgdG8gaW52ZXJ0IHRoZSBwYW5lbCBiYWNrbGlnaHQK ICAqIGJyaWdodG5lc3MgdmFsdWUKICAqLwotc3RhdGljIHZvaWQgcXVpcmtfaW52ZXJ0X2JyaWdo dG5lc3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIHF1aXJrX2ludmVydF9i cmlnaHRuZXNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewotCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlkZXZfcHJpdi0+cXVpcmtz IHw9IFFVSVJLX0lOVkVSVF9CUklHSFRORVNTOworCWk5MTUtPnF1aXJrcyB8PSBRVUlSS19JTlZF UlRfQlJJR0hUTkVTUzsKIAlEUk1fSU5GTygiYXBwbHlpbmcgaW52ZXJ0ZWQgcGFuZWwgYnJpZ2h0 bmVzcyBxdWlya1xuIik7CiB9CiAKIC8qIFNvbWUgVkJUJ3MgaW5jb3JyZWN0bHkgaW5kaWNhdGUg bm8gYmFja2xpZ2h0IGlzIHByZXNlbnQgKi8KLXN0YXRpYyB2b2lkIHF1aXJrX2JhY2tsaWdodF9w cmVzZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBxdWlya19iYWNrbGln aHRfcHJlc2VudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JZGV2X3ByaXYtPnF1aXJr cyB8PSBRVUlSS19CQUNLTElHSFRfUFJFU0VOVDsKKwlpOTE1LT5xdWlya3MgfD0gUVVJUktfQkFD S0xJR0hUX1BSRVNFTlQ7CiAJRFJNX0lORk8oImFwcGx5aW5nIGJhY2tsaWdodCBwcmVzZW50IHF1 aXJrXG4iKTsKIH0KIAogLyogVG9zaGliYSBTYXRlbGxpdGUgUDUwLUMtMThDIHJlcXVpcmVzIFQx MiBkZWxheSB0byBiZSBtaW4gODAwbXMKICAqIHdoaWNoIGlzIDMwMCBtcyBncmVhdGVyIHRoYW4g ZURQIHNwZWMgVDEyIG1pbi4KICAqLwotc3RhdGljIHZvaWQgcXVpcmtfaW5jcmVhc2VfdDEyX2Rl bGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBxdWlya19pbmNyZWFzZV90 MTJfZGVsYXkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCi0JZGV2X3ByaXYtPnF1aXJr cyB8PSBRVUlSS19JTkNSRUFTRV9UMTJfREVMQVk7CisJaTkxNS0+cXVpcmtzIHw9IFFVSVJLX0lO Q1JFQVNFX1QxMl9ERUxBWTsKIAlEUk1fSU5GTygiQXBwbHlpbmcgVDEyIGRlbGF5IHF1aXJrXG4i KTsKIH0KIApAQCAtNTEsMTEgKzQ2LDkgQEAgc3RhdGljIHZvaWQgcXVpcmtfaW5jcmVhc2VfdDEy X2RlbGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAgKiBHZW1pbmlMYWtlIE5VQyBIRE1JIG91 dHB1dHMgcmVxdWlyZSBhZGRpdGlvbmFsIG9mZiB0aW1lCiAgKiB0aGlzIGFsbG93cyB0aGUgb25i b2FyZCByZXRpbWVyIHRvIGNvcnJlY3RseSBzeW5jIHRvIHNpZ25hbAogICovCi1zdGF0aWMgdm9p ZCBxdWlya19pbmNyZWFzZV9kZGlfZGlzYWJsZWRfdGltZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQorc3RhdGljIHZvaWQgcXVpcmtfaW5jcmVhc2VfZGRpX2Rpc2FibGVkX3RpbWUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwotCi0JZGV2X3ByaXYtPnF1aXJrcyB8PSBRVUlSS19JTkNSRUFT RV9ERElfRElTQUJMRURfVElNRTsKKwlpOTE1LT5xdWlya3MgfD0gUVVJUktfSU5DUkVBU0VfRERJ X0RJU0FCTEVEX1RJTUU7CiAJRFJNX0lORk8oIkFwcGx5aW5nIEluY3JlYXNlIERESSBEaXNhYmxl ZCBxdWlya1xuIik7CiB9CiAKQEAgLTYzLDEyICs1NiwxMiBAQCBzdHJ1Y3QgaW50ZWxfcXVpcmsg ewogCWludCBkZXZpY2U7CiAJaW50IHN1YnN5c3RlbV92ZW5kb3I7CiAJaW50IHN1YnN5c3RlbV9k ZXZpY2U7Ci0Jdm9pZCAoKmhvb2spKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworCXZvaWQgKCpo b29rKShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7CiB9OwogCiAvKiBGb3Igc3lzdGVt cyB0aGF0IGRvbid0IGhhdmUgYSBtZWFuaW5nZnVsIFBDSSBzdWJkZXZpY2Uvc3VidmVuZG9yIElE ICovCiBzdHJ1Y3QgaW50ZWxfZG1pX3F1aXJrIHsKLQl2b2lkICgqaG9vaykoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7CisJdm9pZCAoKmhvb2spKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 KTsKIAljb25zdCBzdHJ1Y3QgZG1pX3N5c3RlbV9pZCAoKmRtaV9pZF9saXN0KVtdOwogfTsKIApA QCAtMTU0LDkgKzE0Nyw5IEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfcXVpcmsgaW50ZWxfcXVpcmtz W10gPSB7CiAJeyAweDMxODQsIDB4MTg0OSwgMHgyMjEyLCBxdWlya19pbmNyZWFzZV9kZGlfZGlz YWJsZWRfdGltZSB9LAogfTsKIAotdm9pZCBpbnRlbF9pbml0X3F1aXJrcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQordm9pZCBpbnRlbF9pbml0X3F1aXJrcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSkKIHsKLQlzdHJ1Y3QgcGNpX2RldiAqZCA9IGRldi0+cGRldjsKKwlzdHJ1Y3QgcGNp X2RldiAqZCA9IGk5MTUtPmRybS5wZGV2OwogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IEFS UkFZX1NJWkUoaW50ZWxfcXVpcmtzKTsgaSsrKSB7CkBAIC0xNjcsMTAgKzE2MCwxMCBAQCB2b2lk IGludGVsX2luaXRfcXVpcmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAgICAgcS0+c3Vi c3lzdGVtX3ZlbmRvciA9PSBQQ0lfQU5ZX0lEKSAmJgogCQkgICAgKGQtPnN1YnN5c3RlbV9kZXZp Y2UgPT0gcS0+c3Vic3lzdGVtX2RldmljZSB8fAogCQkgICAgIHEtPnN1YnN5c3RlbV9kZXZpY2Ug PT0gUENJX0FOWV9JRCkpCi0JCQlxLT5ob29rKGRldik7CisJCQlxLT5ob29rKGk5MTUpOwogCX0K IAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShpbnRlbF9kbWlfcXVpcmtzKTsgaSsrKSB7CiAJ CWlmIChkbWlfY2hlY2tfc3lzdGVtKCppbnRlbF9kbWlfcXVpcmtzW2ldLmRtaV9pZF9saXN0KSAh PSAwKQotCQkJaW50ZWxfZG1pX3F1aXJrc1tpXS5ob29rKGRldik7CisJCQlpbnRlbF9kbWlfcXVp cmtzW2ldLmhvb2soaTkxNSk7CiAJfQogfQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK