From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 06/13] drm/i915: pass i915 to intel_modeset_init() and intel_modeset_init_hw() Date: Thu, 19 Sep 2019 17:03:53 +0300 Message-ID: <1615e08dd93b17fc3bf3bf3b2c0ac36a2bdaf5f3.1568901239.git.jani.nikula@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 99E666F7F1 for ; Thu, 19 Sep 2019 14:04:47 +0000 (UTC) In-Reply-To: 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 SW4gZ2VuZXJhbCwgcHJlZmVyIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogb3ZlciBzdHJ1Y3Qg ZHJtX2RldmljZSAqCndoZW4gZWl0aGVyIHdpbGwgZG8uIFJlbmFtZSB0aGUgbG9jYWwgdmFyaWFi bGVzIHRvIGk5MTUuIE5vIGZ1bmN0aW9uYWwKY2hhbmdlcy4KClNpZ25lZC1vZmYtYnk6IEphbmkg TmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCA2OSArKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmggfCAgNCArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgICAgICAgfCAgNCArLQogMyBmaWxlcyBjaGFu Z2VkLCAzNyBpbnNlcnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IDA0MGVlMDA2YjA0Ny4uNzhlZGI1 ZTY2Y2RiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXku YwpAQCAtNDM0Nyw3ICs0MzQ3LDcgQEAgdm9pZCBpbnRlbF9maW5pc2hfcmVzZXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkgKiBzbyBuZWVkIGEgZnVsbCByZS1pbml0aWFs aXphdGlvbi4KIAkJICovCiAJCWludGVsX3Bwc191bmxvY2tfcmVnc193YShkZXZfcHJpdik7Ci0J CWludGVsX21vZGVzZXRfaW5pdF9odyhkZXYpOworCQlpbnRlbF9tb2Rlc2V0X2luaXRfaHcoZGV2 X3ByaXYpOwogCQlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZyhkZXZfcHJpdik7CiAKIAkJc3Bpbl9s b2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKQEAgLTE1OTM0LDEzICsxNTkzNCwxMSBAQCBz dGF0aWMgdm9pZCBpOTE1X2Rpc2FibGVfdmdhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAlQT1NUSU5HX1JFQUQodmdhX3JlZyk7CiB9CiAKLXZvaWQgaW50ZWxfbW9kZXNldF9p bml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVsX21vZGVzZXRfaW5pdF9o dyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KLQlpbnRlbF91cGRhdGVfY2RjbGsoZGV2 X3ByaXYpOwotCWludGVsX2R1bXBfY2RjbGtfc3RhdGUoJmRldl9wcml2LT5jZGNsay5odywgIkN1 cnJlbnQgQ0RDTEsiKTsKLQlkZXZfcHJpdi0+Y2RjbGsubG9naWNhbCA9IGRldl9wcml2LT5jZGNs ay5hY3R1YWwgPSBkZXZfcHJpdi0+Y2RjbGsuaHc7CisJaW50ZWxfdXBkYXRlX2NkY2xrKGk5MTUp OworCWludGVsX2R1bXBfY2RjbGtfc3RhdGUoJmk5MTUtPmNkY2xrLmh3LCAiQ3VycmVudCBDRENM SyIpOworCWk5MTUtPmNkY2xrLmxvZ2ljYWwgPSBpOTE1LT5jZGNsay5hY3R1YWwgPSBpOTE1LT5j ZGNsay5odzsKIH0KIAogLyoKQEAgLTE2MTQ0LDQ0ICsxNjE0Miw0NCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCX0K IH0KIAotaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50 IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9ICZpOTE1LT5kcm07CiAJZW51bSBwaXBlIHBpcGU7CiAJc3RydWN0 IGludGVsX2NydGMgKmNydGM7CiAJaW50IHJldDsKIAotCWRldl9wcml2LT5tb2Rlc2V0X3dxID0g YWxsb2Nfb3JkZXJlZF93b3JrcXVldWUoImk5MTVfbW9kZXNldCIsIDApOwotCWRldl9wcml2LT5m bGlwX3dxID0gYWxsb2Nfd29ya3F1ZXVlKCJpOTE1X2ZsaXAiLCBXUV9ISUdIUFJJIHwKLQkJCQkJ ICAgIFdRX1VOQk9VTkQsIFdRX1VOQk9VTkRfTUFYX0FDVElWRSk7CisJaTkxNS0+bW9kZXNldF93 cSA9IGFsbG9jX29yZGVyZWRfd29ya3F1ZXVlKCJpOTE1X21vZGVzZXQiLCAwKTsKKwlpOTE1LT5m bGlwX3dxID0gYWxsb2Nfd29ya3F1ZXVlKCJpOTE1X2ZsaXAiLCBXUV9ISUdIUFJJIHwKKwkJCQkJ V1FfVU5CT1VORCwgV1FfVU5CT1VORF9NQVhfQUNUSVZFKTsKIAogCWRybV9tb2RlX2NvbmZpZ19p bml0KGRldik7CiAKLQlpbnRlbF9tb2RlX2NvbmZpZ19pbml0KGRldl9wcml2KTsKKwlpbnRlbF9t b2RlX2NvbmZpZ19pbml0KGk5MTUpOwogCi0JcmV0ID0gaW50ZWxfYndfaW5pdChkZXZfcHJpdik7 CisJcmV0ID0gaW50ZWxfYndfaW5pdChpOTE1KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog Ci0JaW5pdF9sbGlzdF9oZWFkKCZkZXZfcHJpdi0+YXRvbWljX2hlbHBlci5mcmVlX2xpc3QpOwot CUlOSVRfV09SSygmZGV2X3ByaXYtPmF0b21pY19oZWxwZXIuZnJlZV93b3JrLAorCWluaXRfbGxp c3RfaGVhZCgmaTkxNS0+YXRvbWljX2hlbHBlci5mcmVlX2xpc3QpOworCUlOSVRfV09SSygmaTkx NS0+YXRvbWljX2hlbHBlci5mcmVlX3dvcmssCiAJCSAgaW50ZWxfYXRvbWljX2hlbHBlcl9mcmVl X3N0YXRlX3dvcmtlcik7CiAKLQlpbnRlbF9pbml0X3F1aXJrcyhkZXZfcHJpdik7CisJaW50ZWxf aW5pdF9xdWlya3MoaTkxNSk7CiAKLQlpbnRlbF9mYmNfaW5pdChkZXZfcHJpdik7CisJaW50ZWxf ZmJjX2luaXQoaTkxNSk7CiAKLQlpbnRlbF9pbml0X3BtKGRldl9wcml2KTsKKwlpbnRlbF9pbml0 X3BtKGk5MTUpOwogCi0JaW50ZWxfcGFuZWxfc2FuaXRpemVfc3NjKGRldl9wcml2KTsKKwlpbnRl bF9wYW5lbF9zYW5pdGl6ZV9zc2MoaTkxNSk7CiAKIAlEUk1fREVCVUdfS01TKCIlZCBkaXNwbGF5 IHBpcGUlcyBhdmFpbGFibGUuXG4iLAotCQkgICAgICBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYp LAotCQkgICAgICBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpID4gMSA/ICJzIiA6ICIiKTsKKwkJ ICAgICAgSU5URUxfTlVNX1BJUEVTKGk5MTUpLAorCQkgICAgICBJTlRFTF9OVU1fUElQRVMoaTkx NSkgPiAxID8gInMiIDogIiIpOwogCi0JaWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSAmJiBJTlRF TF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKSB7Ci0JCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYs IHBpcGUpIHsKLQkJCXJldCA9IGludGVsX2NydGNfaW5pdChkZXZfcHJpdiwgcGlwZSk7CisJaWYg KEhBU19ESVNQTEFZKGk5MTUpICYmIElOVEVMX0RJU1BMQVlfRU5BQkxFRChpOTE1KSkgeworCQlm b3JfZWFjaF9waXBlKGk5MTUsIHBpcGUpIHsKKwkJCXJldCA9IGludGVsX2NydGNfaW5pdChpOTE1 LCBwaXBlKTsKIAkJCWlmIChyZXQpIHsKIAkJCQlkcm1fbW9kZV9jb25maWdfY2xlYW51cChkZXYp OwogCQkJCXJldHVybiByZXQ7CkBAIC0xNjE5MCwxOSArMTYxODgsMTkgQEAgaW50IGludGVsX21v ZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCWludGVsX3NoYXJlZF9k cGxsX2luaXQoZGV2KTsKLQlpbnRlbF91cGRhdGVfZmRpX3BsbF9mcmVxKGRldl9wcml2KTsKKwlp bnRlbF91cGRhdGVfZmRpX3BsbF9mcmVxKGk5MTUpOwogCi0JaW50ZWxfdXBkYXRlX2N6Y2xrKGRl dl9wcml2KTsKLQlpbnRlbF9tb2Rlc2V0X2luaXRfaHcoZGV2KTsKKwlpbnRlbF91cGRhdGVfY3pj bGsoaTkxNSk7CisJaW50ZWxfbW9kZXNldF9pbml0X2h3KGk5MTUpOwogCi0JaW50ZWxfaGRjcF9j b21wb25lbnRfaW5pdChkZXZfcHJpdik7CisJaW50ZWxfaGRjcF9jb21wb25lbnRfaW5pdChpOTE1 KTsKIAotCWlmIChkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPT0gMCkKLQkJaW50ZWxfdXBkYXRl X21heF9jZGNsayhkZXZfcHJpdik7CisJaWYgKGk5MTUtPm1heF9jZGNsa19mcmVxID09IDApCisJ CWludGVsX3VwZGF0ZV9tYXhfY2RjbGsoaTkxNSk7CiAKIAkvKiBKdXN0IGRpc2FibGUgaXQgb25j ZSBhdCBzdGFydHVwICovCi0JaTkxNV9kaXNhYmxlX3ZnYShkZXZfcHJpdik7Ci0JaW50ZWxfc2V0 dXBfb3V0cHV0cyhkZXZfcHJpdik7CisJaTkxNV9kaXNhYmxlX3ZnYShpOTE1KTsKKwlpbnRlbF9z ZXR1cF9vdXRwdXRzKGk5MTUpOwogCiAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKIAlpbnRl bF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKGRldiwgZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0 eCk7CkBAIC0xNjIyMSw4ICsxNjIxOSw3IEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJICogY2FuIGV2ZW4gYWxsb3cgZm9yIHNtb290aCBib290IHRy YW5zaXRpb25zIGlmIHRoZSBCSU9TCiAJCSAqIGZiIGlzIGxhcmdlIGVub3VnaCBmb3IgdGhlIGFj dGl2ZSBwaXBlIGNvbmZpZ3VyYXRpb24uCiAJCSAqLwotCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRf aW5pdGlhbF9wbGFuZV9jb25maWcoY3J0YywKLQkJCQkJCQkgICAmcGxhbmVfY29uZmlnKTsKKwkJ aTkxNS0+ZGlzcGxheS5nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoY3J0YywgJnBsYW5lX2NvbmZp Zyk7CiAKIAkJLyoKIAkJICogSWYgdGhlIGZiIGlzIHNoYXJlZCBiZXR3ZWVuIG11bHRpcGxlIGhl YWRzLCB3ZSdsbApAQCAtMTYyMzYsNyArMTYyMzMsNyBAQCBpbnQgaW50ZWxfbW9kZXNldF9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogTm90ZSB0aGF0IHdlIG5lZWQgdG8gZG8gdGhp cyBhZnRlciByZWNvbnN0cnVjdGluZyB0aGUgQklPUyBmYidzCiAJICogc2luY2UgdGhlIHdhdGVy bWFyayBjYWxjdWxhdGlvbiBkb25lIGhlcmUgd2lsbCB1c2UgcHN0YXRlLT5mYi4KIAkgKi8KLQlp ZiAoIUhBU19HTUNIKGRldl9wcml2KSkKKwlpZiAoIUhBU19HTUNIKGk5MTUpKQogCQlzYW5pdGl6 ZV93YXRlcm1hcmtzKGRldik7CiAKIAkvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuaAppbmRleCBkZmE2MjkxZjFmMzcuLjA0MDVhNzRiNTEzYyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmgKQEAgLTU3Miw4ICs1 NzIsOCBAQCB2b2lkIGludGVsX2Rpc3BsYXlfcHJpbnRfZXJyb3Jfc3RhdGUoc3RydWN0IGRybV9p OTE1X2Vycm9yX3N0YXRlX2J1ZiAqZSwKIAkJCQkgICAgIHN0cnVjdCBpbnRlbF9kaXNwbGF5X2Vy cm9yX3N0YXRlICplcnJvcik7CiAKIC8qIG1vZGVzZXR0aW5nICovCi12b2lkIGludGVsX21vZGVz ZXRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBpbnRlbF9tb2Rlc2V0X2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGludGVsX21vZGVzZXRfaW5pdF9odyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7CitpbnQgaW50ZWxfbW9kZXNldF9pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKIHZvaWQgaW50ZWxfbW9kZXNldF9kcml2ZXJf cmVtb3ZlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKIGludCBpbnRlbF9tb2Rlc2V0 X3ZnYV9zZXRfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29sIHN0 YXRlKTsKIHZvaWQgaW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBkOWI5ZTk2NDRmNWMuLmE5ZWU3M2I2MWY0ZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0zNzgsNyArMzc4LDcgQEAgc3RhdGljIGludCBp OTE1X2RyaXZlcl9tb2Rlc2V0X3Byb2JlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQog CiAJLyogSW1wb3J0YW50OiBUaGUgb3V0cHV0IHNldHVwIGZ1bmN0aW9ucyBjYWxsZWQgYnkgbW9k ZXNldF9pbml0IG5lZWQKIAkgKiB3b3JraW5nIGlycXMgZm9yIGUuZy4gZ21idXMgYW5kIGRwIGF1 eCB0cmFuc2ZlcnMuICovCi0JcmV0ID0gaW50ZWxfbW9kZXNldF9pbml0KCZpOTE1LT5kcm0pOwor CXJldCA9IGludGVsX21vZGVzZXRfaW5pdChpOTE1KTsKIAlpZiAocmV0KQogCQlnb3RvIGNsZWFu dXBfaXJxOwogCkBAIC0xOTA5LDcgKzE5MDksNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3Vt ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaTkxNV9nZW1fcmVzdW1lKGRldl9wcml2KTsK IAotCWludGVsX21vZGVzZXRfaW5pdF9odyhkZXYpOworCWludGVsX21vZGVzZXRfaW5pdF9odyhk ZXZfcHJpdik7CiAJaW50ZWxfaW5pdF9jbG9ja19nYXRpbmcoZGV2X3ByaXYpOwogCiAJc3Bpbl9s b2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4