From: Jani Nikula Subject: [PATCH v2 6/6] drm/i915: pass i915 to intel_modeset_init() and intel_modeset_init_hw() Date: Fri, 20 Sep 2019 21:54:21 +0300 Message-ID: <20190920185421.17822-6-jani.nikula@intel.com> References: <20190920185421.17822-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6AFBE6FD9E for ; Fri, 20 Sep 2019 18:54:43 +0000 (UTC) In-Reply-To: <20190920185421.17822-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 SW4gZ2VuZXJhbCwgcHJlZmVyIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogb3ZlciBzdHJ1Y3Qg ZHJtX2RldmljZSAqCndoZW4gZWl0aGVyIHdpbGwgZG8uIFJlbmFtZSB0aGUgbG9jYWwgdmFyaWFi bGVzIHRvIGk5MTUuIE5vIGZ1bmN0aW9uYWwKY2hhbmdlcy4KClNpZ25lZC1vZmYtYnk6IEphbmkg TmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCA2OSArKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmggfCAgNCArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgICAgICAgfCAgNCArLQogMyBmaWxlcyBjaGFu Z2VkLCAzNyBpbnNlcnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IDljMjYyMjg3MzdhMC4uZjlmMTE2 Yzg5YmNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXku YwpAQCAtNDM2MCw3ICs0MzYwLDcgQEAgdm9pZCBpbnRlbF9maW5pc2hfcmVzZXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkgKiBzbyBuZWVkIGEgZnVsbCByZS1pbml0aWFs aXphdGlvbi4KIAkJICovCiAJCWludGVsX3Bwc191bmxvY2tfcmVnc193YShkZXZfcHJpdik7Ci0J CWludGVsX21vZGVzZXRfaW5pdF9odyhkZXYpOworCQlpbnRlbF9tb2Rlc2V0X2luaXRfaHcoZGV2 X3ByaXYpOwogCQlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZyhkZXZfcHJpdik7CiAKIAkJc3Bpbl9s b2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKQEAgLTE1OTgzLDEzICsxNTk4MywxMSBAQCBz dGF0aWMgdm9pZCBpOTE1X2Rpc2FibGVfdmdhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAlQT1NUSU5HX1JFQUQodmdhX3JlZyk7CiB9CiAKLXZvaWQgaW50ZWxfbW9kZXNldF9p bml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVsX21vZGVzZXRfaW5pdF9o dyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KLQlpbnRlbF91cGRhdGVfY2RjbGsoZGV2 X3ByaXYpOwotCWludGVsX2R1bXBfY2RjbGtfc3RhdGUoJmRldl9wcml2LT5jZGNsay5odywgIkN1 cnJlbnQgQ0RDTEsiKTsKLQlkZXZfcHJpdi0+Y2RjbGsubG9naWNhbCA9IGRldl9wcml2LT5jZGNs ay5hY3R1YWwgPSBkZXZfcHJpdi0+Y2RjbGsuaHc7CisJaW50ZWxfdXBkYXRlX2NkY2xrKGk5MTUp OworCWludGVsX2R1bXBfY2RjbGtfc3RhdGUoJmk5MTUtPmNkY2xrLmh3LCAiQ3VycmVudCBDRENM SyIpOworCWk5MTUtPmNkY2xrLmxvZ2ljYWwgPSBpOTE1LT5jZGNsay5hY3R1YWwgPSBpOTE1LT5j ZGNsay5odzsKIH0KIAogLyoKQEAgLTE2MTk1LDQyICsxNjE5Myw0MiBAQCBzdGF0aWMgdm9pZCBp bnRlbF9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCX0K IH0KIAotaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50 IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9ICZpOTE1LT5kcm07CiAJZW51bSBwaXBlIHBpcGU7CiAJc3RydWN0 IGludGVsX2NydGMgKmNydGM7CiAJaW50IHJldDsKIAotCWRldl9wcml2LT5tb2Rlc2V0X3dxID0g YWxsb2Nfb3JkZXJlZF93b3JrcXVldWUoImk5MTVfbW9kZXNldCIsIDApOwotCWRldl9wcml2LT5m bGlwX3dxID0gYWxsb2Nfd29ya3F1ZXVlKCJpOTE1X2ZsaXAiLCBXUV9ISUdIUFJJIHwKLQkJCQkJ ICAgIFdRX1VOQk9VTkQsIFdRX1VOQk9VTkRfTUFYX0FDVElWRSk7CisJaTkxNS0+bW9kZXNldF93 cSA9IGFsbG9jX29yZGVyZWRfd29ya3F1ZXVlKCJpOTE1X21vZGVzZXQiLCAwKTsKKwlpOTE1LT5m bGlwX3dxID0gYWxsb2Nfd29ya3F1ZXVlKCJpOTE1X2ZsaXAiLCBXUV9ISUdIUFJJIHwKKwkJCQkJ V1FfVU5CT1VORCwgV1FfVU5CT1VORF9NQVhfQUNUSVZFKTsKIAotCWludGVsX21vZGVfY29uZmln X2luaXQoZGV2X3ByaXYpOworCWludGVsX21vZGVfY29uZmlnX2luaXQoaTkxNSk7CiAKLQlyZXQg PSBpbnRlbF9id19pbml0KGRldl9wcml2KTsKKwlyZXQgPSBpbnRlbF9id19pbml0KGk5MTUpOwog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlpbml0X2xsaXN0X2hlYWQoJmRldl9wcml2LT5h dG9taWNfaGVscGVyLmZyZWVfbGlzdCk7Ci0JSU5JVF9XT1JLKCZkZXZfcHJpdi0+YXRvbWljX2hl bHBlci5mcmVlX3dvcmssCisJaW5pdF9sbGlzdF9oZWFkKCZpOTE1LT5hdG9taWNfaGVscGVyLmZy ZWVfbGlzdCk7CisJSU5JVF9XT1JLKCZpOTE1LT5hdG9taWNfaGVscGVyLmZyZWVfd29yaywKIAkJ ICBpbnRlbF9hdG9taWNfaGVscGVyX2ZyZWVfc3RhdGVfd29ya2VyKTsKIAotCWludGVsX2luaXRf cXVpcmtzKGRldl9wcml2KTsKKwlpbnRlbF9pbml0X3F1aXJrcyhpOTE1KTsKIAotCWludGVsX2Zi Y19pbml0KGRldl9wcml2KTsKKwlpbnRlbF9mYmNfaW5pdChpOTE1KTsKIAotCWludGVsX2luaXRf cG0oZGV2X3ByaXYpOworCWludGVsX2luaXRfcG0oaTkxNSk7CiAKLQlpbnRlbF9wYW5lbF9zYW5p dGl6ZV9zc2MoZGV2X3ByaXYpOworCWludGVsX3BhbmVsX3Nhbml0aXplX3NzYyhpOTE1KTsKIAog CURSTV9ERUJVR19LTVMoIiVkIGRpc3BsYXkgcGlwZSVzIGF2YWlsYWJsZS5cbiIsCi0JCSAgICAg IElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdiksCi0JCSAgICAgIElOVEVMX05VTV9QSVBFUyhkZXZf cHJpdikgPiAxID8gInMiIDogIiIpOworCQkgICAgICBJTlRFTF9OVU1fUElQRVMoaTkxNSksCisJ CSAgICAgIElOVEVMX05VTV9QSVBFUyhpOTE1KSA+IDEgPyAicyIgOiAiIik7CiAKLQlpZiAoSEFT X0RJU1BMQVkoZGV2X3ByaXYpICYmIElOVEVMX0RJU1BMQVlfRU5BQkxFRChkZXZfcHJpdikpIHsK LQkJZm9yX2VhY2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgewotCQkJcmV0ID0gaW50ZWxfY3J0Y19p bml0KGRldl9wcml2LCBwaXBlKTsKKwlpZiAoSEFTX0RJU1BMQVkoaTkxNSkgJiYgSU5URUxfRElT UExBWV9FTkFCTEVEKGk5MTUpKSB7CisJCWZvcl9lYWNoX3BpcGUoaTkxNSwgcGlwZSkgeworCQkJ cmV0ID0gaW50ZWxfY3J0Y19pbml0KGk5MTUsIHBpcGUpOwogCQkJaWYgKHJldCkgewogCQkJCWRy bV9tb2RlX2NvbmZpZ19jbGVhbnVwKGRldik7CiAJCQkJcmV0dXJuIHJldDsKQEAgLTE2MjM5LDE5 ICsxNjIzNywxOSBAQCBpbnQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJfQogCiAJaW50ZWxfc2hhcmVkX2RwbGxfaW5pdChkZXYpOwotCWludGVsX3VwZGF0ZV9m ZGlfcGxsX2ZyZXEoZGV2X3ByaXYpOworCWludGVsX3VwZGF0ZV9mZGlfcGxsX2ZyZXEoaTkxNSk7 CiAKLQlpbnRlbF91cGRhdGVfY3pjbGsoZGV2X3ByaXYpOwotCWludGVsX21vZGVzZXRfaW5pdF9o dyhkZXYpOworCWludGVsX3VwZGF0ZV9jemNsayhpOTE1KTsKKwlpbnRlbF9tb2Rlc2V0X2luaXRf aHcoaTkxNSk7CiAKLQlpbnRlbF9oZGNwX2NvbXBvbmVudF9pbml0KGRldl9wcml2KTsKKwlpbnRl bF9oZGNwX2NvbXBvbmVudF9pbml0KGk5MTUpOwogCi0JaWYgKGRldl9wcml2LT5tYXhfY2RjbGtf ZnJlcSA9PSAwKQotCQlpbnRlbF91cGRhdGVfbWF4X2NkY2xrKGRldl9wcml2KTsKKwlpZiAoaTkx NS0+bWF4X2NkY2xrX2ZyZXEgPT0gMCkKKwkJaW50ZWxfdXBkYXRlX21heF9jZGNsayhpOTE1KTsK IAogCS8qIEp1c3QgZGlzYWJsZSBpdCBvbmNlIGF0IHN0YXJ0dXAgKi8KLQlpOTE1X2Rpc2FibGVf dmdhKGRldl9wcml2KTsKLQlpbnRlbF9zZXR1cF9vdXRwdXRzKGRldl9wcml2KTsKKwlpOTE1X2Rp c2FibGVfdmdhKGk5MTUpOworCWludGVsX3NldHVwX291dHB1dHMoaTkxNSk7CiAKIAlkcm1fbW9k ZXNldF9sb2NrX2FsbChkZXYpOwogCWludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoZGV2LCBk ZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4KTsKQEAgLTE2MjcwLDggKzE2MjY4LDcgQEAgaW50 IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgKiBjYW4gZXZl biBhbGxvdyBmb3Igc21vb3RoIGJvb3QgdHJhbnNpdGlvbnMgaWYgdGhlIEJJT1MKIAkJICogZmIg aXMgbGFyZ2UgZW5vdWdoIGZvciB0aGUgYWN0aXZlIHBpcGUgY29uZmlndXJhdGlvbi4KIAkJICov Ci0JCWRldl9wcml2LT5kaXNwbGF5LmdldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhjcnRjLAotCQkJ CQkJCSAgICZwbGFuZV9jb25maWcpOworCQlpOTE1LT5kaXNwbGF5LmdldF9pbml0aWFsX3BsYW5l X2NvbmZpZyhjcnRjLCAmcGxhbmVfY29uZmlnKTsKIAogCQkvKgogCQkgKiBJZiB0aGUgZmIgaXMg c2hhcmVkIGJldHdlZW4gbXVsdGlwbGUgaGVhZHMsIHdlJ2xsCkBAIC0xNjI4NSw3ICsxNjI4Miw3 IEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKiBO b3RlIHRoYXQgd2UgbmVlZCB0byBkbyB0aGlzIGFmdGVyIHJlY29uc3RydWN0aW5nIHRoZSBCSU9T IGZiJ3MKIAkgKiBzaW5jZSB0aGUgd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGRvbmUgaGVyZSB3aWxs IHVzZSBwc3RhdGUtPmZiLgogCSAqLwotCWlmICghSEFTX0dNQ0goZGV2X3ByaXYpKQorCWlmICgh SEFTX0dNQ0goaTkxNSkpCiAJCXNhbml0aXplX3dhdGVybWFya3MoZGV2KTsKIAogCS8qCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCmluZGV4IDkzM2NiZTM2 YmI1OS4uNWNlYTZmOGUxMDdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuaApAQCAtNTc2LDggKzU3Niw4IEBAIHZvaWQgaW50ZWxfZGlzcGxheV9wcmlu dF9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICplLAogCQkJCSAg ICAgc3RydWN0IGludGVsX2Rpc3BsYXlfZXJyb3Jfc3RhdGUgKmVycm9yKTsKIAogLyogbW9kZXNl dHRpbmcgKi8KLXZvaWQgaW50ZWxfbW9kZXNldF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwotaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3Zv aWQgaW50ZWxfbW9kZXNldF9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsK K2ludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpOwog dm9pZCBpbnRlbF9tb2Rlc2V0X2RyaXZlcl9yZW1vdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUpOwogaW50IGludGVsX21vZGVzZXRfdmdhX3NldF9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIGJvb2wgc3RhdGUpOwogdm9pZCBpbnRlbF9kaXNwbGF5X3Jlc3Vt ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGQ5 YjllOTY0NGY1Yy4uYTllZTczYjYxZjRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTM3 OCw3ICszNzgsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX21vZGVzZXRfcHJvYmUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAKIAkvKiBJbXBvcnRhbnQ6IFRoZSBvdXRwdXQgc2V0 dXAgZnVuY3Rpb25zIGNhbGxlZCBieSBtb2Rlc2V0X2luaXQgbmVlZAogCSAqIHdvcmtpbmcgaXJx cyBmb3IgZS5nLiBnbWJ1cyBhbmQgZHAgYXV4IHRyYW5zZmVycy4gKi8KLQlyZXQgPSBpbnRlbF9t b2Rlc2V0X2luaXQoJmk5MTUtPmRybSk7CisJcmV0ID0gaW50ZWxfbW9kZXNldF9pbml0KGk5MTUp OwogCWlmIChyZXQpCiAJCWdvdG8gY2xlYW51cF9pcnE7CiAKQEAgLTE5MDksNyArMTkwOSw3IEBA IHN0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlp OTE1X2dlbV9yZXN1bWUoZGV2X3ByaXYpOwogCi0JaW50ZWxfbW9kZXNldF9pbml0X2h3KGRldik7 CisJaW50ZWxfbW9kZXNldF9pbml0X2h3KGRldl9wcml2KTsKIAlpbnRlbF9pbml0X2Nsb2NrX2dh dGluZyhkZXZfcHJpdik7CiAKIAlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwot LSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=