From: Michal Wajdeczko Subject: [PATCH v4 1/3] drm/i915: Reorder early initialization Date: Fri, 23 Mar 2018 12:34:49 +0000 Message-ID: <20180323123451.59244-1-michal.wajdeczko@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C816F6E0EE for ; Fri, 23 Mar 2018 12:56:44 +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 List-Id: intel-gfx@lists.freedesktop.org SW4gdXBjb21pbmcgcGF0Y2gsIHdlIHdhbnQgdG8gcGVyZm9ybSBtb3JlIGFjdGlvbnMgaW4gZWFy bHkKaW5pdGlhbGl6YXRpb24gb2YgdGhlIHVDLiBUaGlzIHJlb3JkZXJpbmcgd2lsbCBoZWxwIHJl c29sdmUKbmV3IGRlcGVuZGVuY2llcyB0aGF0IHdpbGwgYmUgaW50cm9kdWNlZCBieSBmdXR1cmUg cGF0Y2guCgp2Mjogcy9pOTE1X2dlbV9sb2FkX2luaXQvaTkxNV9nZW1faW5pdF9lYXJseSAoQ2hy aXMpCnYzOiBzL2k5MTVfZ2VtX2xvYWRfY2xlYW51cC9pOTE1X2dlbV9jbGVhbnVwX2Vhcmx5IChN aWNoYWwpCgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtv QGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpD YzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IEpvb25hcyBM YWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPiAjMgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAxNyArKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgfCAgNSArKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxNCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBhN2QzMjc1Li4yNTYxOTc0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTkxOSwxNyArOTE5LDIxIEBAIHN0YXRpYyBp bnQgaTkxNV9kcml2ZXJfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPndtLndtX211dGV4KTsKIAltdXRleF9pbml0KCZk ZXZfcHJpdi0+cHBzX211dGV4KTsKIAotCWludGVsX3dvcGNtX2luaXRfZWFybHkoJmRldl9wcml2 LT53b3BjbSk7Ci0JaW50ZWxfdWNfaW5pdF9lYXJseShkZXZfcHJpdik7CiAJaTkxNV9tZW1jcHlf aW5pdF9lYXJseShkZXZfcHJpdik7CiAKIAlyZXQgPSBpOTE1X3dvcmtxdWV1ZXNfaW5pdChkZXZf cHJpdik7CiAJaWYgKHJldCA8IDApCiAJCWdvdG8gZXJyX2VuZ2luZXM7CiAKKwlyZXQgPSBpOTE1 X2dlbV9pbml0X2Vhcmx5KGRldl9wcml2KTsKKwlpZiAocmV0IDwgMCkKKwkJZ290byBlcnJfd29y a3F1ZXVlczsKKwogCS8qIFRoaXMgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGFueSBjYWxscyB0byBI QVNfUENIXyogKi8KIAlpbnRlbF9kZXRlY3RfcGNoKGRldl9wcml2KTsKIAorCWludGVsX3dvcGNt X2luaXRfZWFybHkoJmRldl9wcml2LT53b3BjbSk7CisJaW50ZWxfdWNfaW5pdF9lYXJseShkZXZf cHJpdik7CiAJaW50ZWxfcG1fc2V0dXAoZGV2X3ByaXYpOwogCWludGVsX2luaXRfZHBpbyhkZXZf cHJpdik7CiAJaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KGRldl9wcml2KTsKQEAgLTkzOCwxOCAr OTQyLDEzIEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaW50ZWxfaW5pdF9kaXNwbGF5X2hvb2tzKGRldl9wcml2 KTsKIAlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZ19ob29rcyhkZXZfcHJpdik7CiAJaW50ZWxfaW5p dF9hdWRpb19ob29rcyhkZXZfcHJpdik7Ci0JcmV0ID0gaTkxNV9nZW1fbG9hZF9pbml0KGRldl9w cml2KTsKLQlpZiAocmV0IDwgMCkKLQkJZ290byBlcnJfaXJxOwotCiAJaW50ZWxfZGlzcGxheV9j cmNfaW5pdChkZXZfcHJpdik7CiAKIAlpbnRlbF9kZXRlY3RfcHJlcHJvZHVjdGlvbl9odyhkZXZf cHJpdik7CiAKIAlyZXR1cm4gMDsKIAotZXJyX2lycToKLQlpbnRlbF9pcnFfZmluaShkZXZfcHJp dik7CitlcnJfd29ya3F1ZXVlczoKIAlpOTE1X3dvcmtxdWV1ZXNfY2xlYW51cChkZXZfcHJpdik7 CiBlcnJfZW5naW5lczoKIAlpOTE1X2VuZ2luZXNfY2xlYW51cChkZXZfcHJpdik7CkBAIC05NjIs OCArOTYxLDggQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2Vhcmx5KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKICAqLwogc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfY2xl YW51cF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaTkxNV9n ZW1fbG9hZF9jbGVhbnVwKGRldl9wcml2KTsKIAlpbnRlbF9pcnFfZmluaShkZXZfcHJpdik7CisJ aTkxNV9nZW1fY2xlYW51cF9lYXJseShkZXZfcHJpdik7CiAJaTkxNV93b3JrcXVldWVzX2NsZWFu dXAoZGV2X3ByaXYpOwogCWk5MTVfZW5naW5lc19jbGVhbnVwKGRldl9wcml2KTsKIH0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IGM5YzNiMmIuLjI4YWI5MTggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaApAQCAtMjg2OSw4ICsyODY5LDggQEAgaW50IGk5MTVfZ2VtX2dldF9hcGVydHVyZV9p b2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogaW50IGk5MTVfZ2VtX3dh aXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCXN0cnVjdCBk cm1fZmlsZSAqZmlsZV9wcml2KTsKIHZvaWQgaTkxNV9nZW1fc2FuaXRpemUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUpOwotaW50IGk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpOTE1X2dlbV9sb2FkX2NsZWFudXAoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2ludCBpOTE1X2dlbV9pbml0X2Vhcmx5KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cit2b2lkIGk5MTVfZ2VtX2NsZWFudXBf ZWFybHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9nZW1f bG9hZF9pbml0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50 IGk5MTVfZ2VtX2ZyZWV6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50 IGk5MTVfZ2VtX2ZyZWV6ZV9sYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4MDJkZjhlLi45NjUwYTdiIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTU1MDIsOCArNTUwMiw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2Vt X2luaXRfX21tKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCUlOSVRfV09SSygmaTkx NS0+bW0uZnJlZV93b3JrLCBfX2k5MTVfZ2VtX2ZyZWVfd29yayk7CiB9CiAKLWludAotaTkxNV9n ZW1fbG9hZF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK2ludCBpOTE1 X2dlbV9pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlp bnQgZXJyID0gLUVOT01FTTsKIApAQCAtNTU3OCw3ICs1NTc3LDcgQEAgc3RhdGljIHZvaWQgaTkx NV9nZW1faW5pdF9fbW0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJcmV0dXJuIGVy cjsKIH0KIAotdm9pZCBpOTE1X2dlbV9sb2FkX2NsZWFudXAoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQordm9pZCBpOTE1X2dlbV9jbGVhbnVwX2Vhcmx5KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlpOTE1X2dlbV9kcmFpbl9mcmVlZF9vYmplY3RzKGRl dl9wcml2KTsKIAlHRU1fQlVHX09OKCFsbGlzdF9lbXB0eSgmZGV2X3ByaXYtPm1tLmZyZWVfbGlz dCkpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=