From: Jani Nikula Subject: [PATCH 2/2] drm/i915/quirks: pass dev_priv instead of drm dev to quirk code Date: Tue, 16 Oct 2018 17:42:28 +0300 Message-ID: <20181016144228.18267-2-jani.nikula@intel.com> References: <20181016144228.18267-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFD616E24A for ; Tue, 16 Oct 2018 14:42:49 +0000 (UTC) In-Reply-To: <20181016144228.18267-1-jani.nikula@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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org UGFzcyB0aGUgdHlwZSB3ZSB3YW50IHRvIHNpbXBsaWZ5LiBObyBmdW5jdGlvbmFsIGNoYW5nZXMu CgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAyICstCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcXVpcmtzLmMgIHwgMjkgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmls ZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDgwZDU3ZWU0NzI1ZS4uY2U3NjM1ZDcyYzk0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xNDkyOCw3ICsxNDkyOCw3IEBA IGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlJTklUX1dP UksoJmRldl9wcml2LT5hdG9taWNfaGVscGVyLmZyZWVfd29yaywKIAkJICBpbnRlbF9hdG9taWNf aGVscGVyX2ZyZWVfc3RhdGVfd29ya2VyKTsKIAotCWludGVsX2luaXRfcXVpcmtzKGRldik7CisJ aW50ZWxfaW5pdF9xdWlya3MoZGV2X3ByaXYpOwogCiAJaW50ZWxfaW5pdF9wbShkZXZfcHJpdik7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMTA4ZjYyZDMxOGU4Li4yMjdlNDNhNGIx YmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xOTgyLDcgKzE5ODIsNyBAQCBpbnQg aW50ZWxfcHNyX3dhaXRfZm9yX2lkbGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5l d19jcnRjX3N0YXRlLAogCQkJICAgIHUzMiAqb3V0X3ZhbHVlKTsKIAogLyogaW50ZWxfcXVpcmtz LmMgKi8KLXZvaWQgaW50ZWxfaW5pdF9xdWlya3Moc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2 b2lkIGludGVsX2luaXRfcXVpcmtzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiAKIC8qIGludGVsX3J1bnRpbWVfcG0uYyAqLwogaW50IGludGVsX3Bvd2VyX2RvbWFpbnNfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3F1aXJrcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcXVpcmtz LmMKaW5kZXggYTQxZGQ1NTJlMzk5Li41ZWFiMTlhNTQ5MGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3F1aXJrcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3F1aXJrcy5jCkBAIC0xMCw5ICsxMCw4IEBACiAvKgogICogU29tZSBtYWNoaW5lcyAoTGVu b3ZvIFUxNjApIGRvIG5vdCB3b3JrIHdpdGggU1NDIG9uIExWRFMgZm9yIHNvbWUgcmVhc29uCiAg Ki8KLXN0YXRpYyB2b2lkIHF1aXJrX3NzY19mb3JjZV9kaXNhYmxlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCitzdGF0aWMgdm9pZCBxdWlya19zc2NfZm9yY2VfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwogCWRldl9wcml2LT5xdWlya3MgfD0gUVVJUktfTFZEU19TU0Nf RElTQUJMRTsKIAlEUk1fSU5GTygiYXBwbHlpbmcgbHZkcyBTU0MgZGlzYWJsZSBxdWlya1xuIik7 CiB9CkBAIC0yMSwxNyArMjAsMTUgQEAgc3RhdGljIHZvaWQgcXVpcmtfc3NjX2ZvcmNlX2Rpc2Fi bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIEEgbWFjaGluZSAoZS5nLiBBY2VyIEFzcGly ZSA1NzM0WikgbWF5IG5lZWQgdG8gaW52ZXJ0IHRoZSBwYW5lbCBiYWNrbGlnaHQKICAqIGJyaWdo dG5lc3MgdmFsdWUKICAqLwotc3RhdGljIHZvaWQgcXVpcmtfaW52ZXJ0X2JyaWdodG5lc3Moc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIHF1aXJrX2ludmVydF9icmlnaHRuZXNz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJZGV2X3ByaXYtPnF1aXJrcyB8PSBR VUlSS19JTlZFUlRfQlJJR0hUTkVTUzsKIAlEUk1fSU5GTygiYXBwbHlpbmcgaW52ZXJ0ZWQgcGFu ZWwgYnJpZ2h0bmVzcyBxdWlya1xuIik7CiB9CiAKIC8qIFNvbWUgVkJUJ3MgaW5jb3JyZWN0bHkg aW5kaWNhdGUgbm8gYmFja2xpZ2h0IGlzIHByZXNlbnQgKi8KLXN0YXRpYyB2b2lkIHF1aXJrX2Jh Y2tsaWdodF9wcmVzZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBxdWly a19iYWNrbGlnaHRfcHJlc2VudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWRl dl9wcml2LT5xdWlya3MgfD0gUVVJUktfQkFDS0xJR0hUX1BSRVNFTlQ7CiAJRFJNX0lORk8oImFw cGx5aW5nIGJhY2tsaWdodCBwcmVzZW50IHF1aXJrXG4iKTsKIH0KQEAgLTM5LDEwICszNiw4IEBA IHN0YXRpYyB2b2lkIHF1aXJrX2JhY2tsaWdodF9wcmVzZW50KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAvKiBUb3NoaWJhIFNhdGVsbGl0ZSBQNTAtQy0xOEMgcmVxdWlyZXMgVDEyIGRlbGF5IHRv IGJlIG1pbiA4MDBtcwogICogd2hpY2ggaXMgMzAwIG1zIGdyZWF0ZXIgdGhhbiBlRFAgc3BlYyBU MTIgbWluLgogICovCi1zdGF0aWMgdm9pZCBxdWlya19pbmNyZWFzZV90MTJfZGVsYXkoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIHF1aXJrX2luY3JlYXNlX3QxMl9kZWxheShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCiAJZGV2X3ByaXYtPnF1aXJrcyB8PSBR VUlSS19JTkNSRUFTRV9UMTJfREVMQVk7CiAJRFJNX0lORk8oIkFwcGx5aW5nIFQxMiBkZWxheSBx dWlya1xuIik7CiB9CkBAIC01MSwxMCArNDYsOCBAQCBzdGF0aWMgdm9pZCBxdWlya19pbmNyZWFz ZV90MTJfZGVsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIEdlbWluaUxha2UgTlVDIEhE TUkgb3V0cHV0cyByZXF1aXJlIGFkZGl0aW9uYWwgb2ZmIHRpbWUKICAqIHRoaXMgYWxsb3dzIHRo ZSBvbmJvYXJkIHJldGltZXIgdG8gY29ycmVjdGx5IHN5bmMgdG8gc2lnbmFsCiAgKi8KLXN0YXRp YyB2b2lkIHF1aXJrX2luY3JlYXNlX2RkaV9kaXNhYmxlZF90aW1lKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCitzdGF0aWMgdm9pZCBxdWlya19pbmNyZWFzZV9kZGlfZGlzYWJsZWRfdGltZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCiAJZGV2X3ByaXYtPnF1aXJrcyB8PSBRVUlS S19JTkNSRUFTRV9ERElfRElTQUJMRURfVElNRTsKIAlEUk1fSU5GTygiQXBwbHlpbmcgSW5jcmVh c2UgRERJIERpc2FibGVkIHF1aXJrXG4iKTsKIH0KQEAgLTYzLDEyICs1NiwxMiBAQCBzdHJ1Y3Qg aW50ZWxfcXVpcmsgewogCWludCBkZXZpY2U7CiAJaW50IHN1YnN5c3RlbV92ZW5kb3I7CiAJaW50 IHN1YnN5c3RlbV9kZXZpY2U7Ci0Jdm9pZCAoKmhvb2spKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OworCXZvaWQgKCpob29rKShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogfTsK IAogLyogRm9yIHN5c3RlbXMgdGhhdCBkb24ndCBoYXZlIGEgbWVhbmluZ2Z1bCBQQ0kgc3ViZGV2 aWNlL3N1YnZlbmRvciBJRCAqLwogc3RydWN0IGludGVsX2RtaV9xdWlyayB7Ci0Jdm9pZCAoKmhv b2spKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworCXZvaWQgKCpob29rKShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCWNvbnN0IHN0cnVjdCBkbWlfc3lzdGVtX2lkICgqZG1p X2lkX2xpc3QpW107CiB9OwogCkBAIC0xNTQsOSArMTQ3LDkgQEAgc3RhdGljIHN0cnVjdCBpbnRl bF9xdWlyayBpbnRlbF9xdWlya3NbXSA9IHsKIAl7IDB4MzE4NCwgMHgxODQ5LCAweDIyMTIsIHF1 aXJrX2luY3JlYXNlX2RkaV9kaXNhYmxlZF90aW1lIH0sCiB9OwogCi12b2lkIGludGVsX2luaXRf cXVpcmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVsX2luaXRfcXVpcmtzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgcGNpX2RldiAqZCA9 IGRldi0+cGRldjsKKwlzdHJ1Y3QgcGNpX2RldiAqZCA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlp bnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGludGVsX3F1aXJrcyk7IGkrKykg ewpAQCAtMTY3LDEwICsxNjAsMTAgQEAgdm9pZCBpbnRlbF9pbml0X3F1aXJrcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQkgICAgIHEtPnN1YnN5c3RlbV92ZW5kb3IgPT0gUENJX0FOWV9JRCkg JiYKIAkJICAgIChkLT5zdWJzeXN0ZW1fZGV2aWNlID09IHEtPnN1YnN5c3RlbV9kZXZpY2UgfHwK IAkJICAgICBxLT5zdWJzeXN0ZW1fZGV2aWNlID09IFBDSV9BTllfSUQpKQotCQkJcS0+aG9vayhk ZXYpOworCQkJcS0+aG9vayhkZXZfcHJpdik7CiAJfQogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9T SVpFKGludGVsX2RtaV9xdWlya3MpOyBpKyspIHsKIAkJaWYgKGRtaV9jaGVja19zeXN0ZW0oKmlu dGVsX2RtaV9xdWlya3NbaV0uZG1pX2lkX2xpc3QpICE9IDApCi0JCQlpbnRlbF9kbWlfcXVpcmtz W2ldLmhvb2soZGV2KTsKKwkJCWludGVsX2RtaV9xdWlya3NbaV0uaG9vayhkZXZfcHJpdik7CiAJ fQogfQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK