From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 07/17] drm/i915: Move load time gem_load_init earlier Date: Fri, 11 Mar 2016 18:31:32 +0200 Message-ID: <1457713902-2425-8-git-send-email-imre.deak@intel.com> References: <1457713902-2425-1-git-send-email-imre.deak@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 ESMTP id DD41C6EB1C for ; Fri, 11 Mar 2016 16:31:55 +0000 (UTC) In-Reply-To: <1457713902-2425-1-git-send-email-imre.deak@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 List-Id: intel-gfx@lists.freedesktop.org VGhlIG9ubHkgc3RlcHMgcmVxdWlyaW5nIGRldmljZSBhY2Nlc3MgaXMgdGhlIGZlbmNlIGFuZCBz d2l6emxpbmcKaW5pdGlhbGl6YXRpb24sIHNvIHNwbGl0IHRoZXNlIG91dCBrZWVwaW5nIHRoZW0g aW4gdGhlaXIgY3VycmVudCBwbGFjZQphbmQgbW92ZSB0aGUgcmVzdCBvZiBpbml0IHN0ZXBzIGVh cmxpZXIuCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyB8IDEzICsrKysrKysrLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jIHwgMzQgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMyBm aWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kbWEuYwppbmRleCBkYTk2Y2NkLi45YWRhNTAwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZG1hLmMKQEAgLTEwMzEsNiArMTAzMSw3IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJaW50ZWxfaW5pdF9kaXNwbGF5 X2hvb2tzKGRldl9wcml2KTsKIAlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZ19ob29rcyhkZXZfcHJp dik7CiAJaW50ZWxfaW5pdF9hdWRpb19ob29rcyhkZXZfcHJpdik7CisJaTkxNV9nZW1fbG9hZF9p bml0KGRldik7CiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKQEAgLTExMTQs NyArMTExNSw5IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAKIAlpbnRlbF9vcHJlZ2lvbl9zZXR1cChkZXYpOwogCi0J aTkxNV9nZW1fbG9hZF9pbml0KGRldik7CisJaTkxNV9nZW1fbG9hZF9pbml0X2ZlbmNlcyhkZXZf cHJpdik7CisJaTkxNV9nZW1fZGV0ZWN0X2JpdF82X3N3aXp6bGUoZGV2KTsKKwogCWk5MTVfZ2Vt X3Nocmlua2VyX2luaXQoZGV2X3ByaXYpOwogCiAJLyogT24gdGhlIDk0NUcvR00sIHRoZSBjaGlw c2V0IHJlcG9ydHMgdGhlIE1TSSBjYXBhYmlsaXR5IG9uIHRoZQpAQCAtMTEzNiw3ICsxMTM5LDcg QEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQg bG9uZyBmbGFncykKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpIHsKIAkJcmV0ID0g ZHJtX3ZibGFua19pbml0KGRldiwgSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpOwogCQlpZiAo cmV0KQotCQkJZ290byBvdXRfZ2VtX3VubG9hZDsKKwkJCWdvdG8gb3V0X2NsZWFudXBfc2hyaW5r ZXI7CiAJfQogCiAJcmV0ID0gaTkxNV9sb2FkX21vZGVzZXRfaW5pdChkZXYpOwpAQCAtMTE3NCw3 ICsxMTc3LDcgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dW5zaWduZWQgbG9uZyBmbGFncykKIG91dF9wb3dlcl93ZWxsOgogCWludGVsX3Bvd2VyX2RvbWFp bnNfZmluaShkZXZfcHJpdik7CiAJZHJtX3ZibGFua19jbGVhbnVwKGRldik7Ci1vdXRfZ2VtX3Vu bG9hZDoKK291dF9jbGVhbnVwX3Nocmlua2VyOgogCWk5MTVfZ2VtX3Nocmlua2VyX2NsZWFudXAo ZGV2X3ByaXYpOwogCiAJaWYgKGRldi0+cGRldi0+bXNpX2VuYWJsZWQpCkBAIC0xMTkwLDkgKzEx OTMsOSBAQCBvdXRfdW5jb3JlX2Zpbmk6CiAJaTkxNV9tbWlvX2NsZWFudXAoZGV2KTsKIHB1dF9i cmlkZ2U6CiAJcGNpX2Rldl9wdXQoZGV2X3ByaXYtPmJyaWRnZV9kZXYpOwotCWk5MTVfZ2VtX2xv YWRfY2xlYW51cChkZXYpOwogb3V0X3J1bnRpbWVfcG1fcHV0OgogCWludGVsX3J1bnRpbWVfcG1f cHV0KGRldl9wcml2KTsKKwlpOTE1X2dlbV9sb2FkX2NsZWFudXAoZGV2KTsKIAlpOTE1X3dvcmtx dWV1ZXNfY2xlYW51cChkZXZfcHJpdik7CiBvdXRfZnJlZV9wcml2OgogCWtmcmVlKGRldl9wcml2 KTsKQEAgLTEyNzcsOCArMTI4MCw4IEBAIGludCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlpbnRlbF91bmNvcmVfZmluaShkZXYpOwogCWk5MTVfbW1pb19jbGVh bnVwKGRldik7CiAKLQlpOTE1X2dlbV9sb2FkX2NsZWFudXAoZGV2KTsKIAlwY2lfZGV2X3B1dChk ZXZfcHJpdi0+YnJpZGdlX2Rldik7CisJaTkxNV9nZW1fbG9hZF9jbGVhbnVwKGRldik7CiAJaTkx NV93b3JrcXVldWVzX2NsZWFudXAoZGV2X3ByaXYpOwogCWtmcmVlKGRldl9wcml2KTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMTU1N2Q2NS4uZjYyYjZkMSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC0yODM2LDYgKzI4MzYsNyBAQCBpbnQgaTkxNV9nZW1fd2FpdF9pb2N0bChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJc3RydWN0IGRybV9maWxlICpm aWxlX3ByaXYpOwogdm9pZCBpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiB2b2lkIGk5MTVfZ2VtX2xvYWRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K3ZvaWQgaTkxNV9nZW1fbG9hZF9pbml0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwogdm9pZCAqaTkxNV9nZW1fb2JqZWN0X2FsbG9jKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogdm9pZCBpOTE1X2dlbV9vYmplY3RfZnJlZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqKTsKIHZvaWQgaTkxNV9nZW1fb2JqZWN0X2luaXQoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGI4NTRhZjIuLjNkYWIw ZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNTAyOSw2ICs1MDI5LDI2IEBAIGluaXRf cmluZ19saXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogfQogCiB2b2lkCitpOTE1 X2dlbV9sb2FkX2luaXRfZmVuY2VzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK K3sKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA3ICYmICFJU19WQUxMRVlWSUVX KGRldl9wcml2KSAmJgorCSAgICAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCisJCWRldl9wcml2 LT5udW1fZmVuY2VfcmVncyA9IDMyOworCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5n ZW4gPj0gNCB8fCBJU19JOTQ1RyhkZXZfcHJpdikgfHwKKwkJIElTX0k5NDVHTShkZXZfcHJpdikg fHwgSVNfRzMzKGRldl9wcml2KSkKKwkJZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzID0gMTY7CisJ ZWxzZQorCQlkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPSA4OworCisJaWYgKGludGVsX3ZncHVf YWN0aXZlKGRldl9wcml2LT5kZXYpKQorCQlkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPQorCQkJ CUk5MTVfUkVBRCh2Z3RpZl9yZWcoYXZhaWxfcnMuZmVuY2VfbnVtKSk7CisKKwkvKiBJbml0aWFs aXplIGZlbmNlIHJlZ2lzdGVycyB0byB6ZXJvICovCisJaTkxNV9nZW1fcmVzdG9yZV9mZW5jZXMo ZGV2X3ByaXYtPmRldik7Cit9CisKK3ZvaWQKIGk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CkBAIC01MDY3LDE3ICs1MDg3LDYgQEAgaTkxNV9nZW1fbG9hZF9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRz X21vZGUgPSBJOTE1X0VYRUNfQ09OU1RBTlRTX1JFTF9HRU5FUkFMOwogCi0JaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDcgJiYgIUlTX1ZBTExFWVZJRVcoZGV2KSAmJiAhSVNfQ0hFUlJZVklF VyhkZXYpKQotCQlkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPSAzMjsKLQllbHNlIGlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA0IHx8IElTX0k5NDVHKGRldikgfHwgSVNfSTk0NUdNKGRldikg fHwgSVNfRzMzKGRldikpCi0JCWRldl9wcml2LT5udW1fZmVuY2VfcmVncyA9IDE2OwotCWVsc2UK LQkJZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzID0gODsKLQotCWlmIChpbnRlbF92Z3B1X2FjdGl2 ZShkZXYpKQotCQlkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPQotCQkJCUk5MTVfUkVBRCh2Z3Rp Zl9yZWcoYXZhaWxfcnMuZmVuY2VfbnVtKSk7Ci0KIAkvKgogCSAqIFNldCBpbml0aWFsIHNlcXVl bmNlIG51bWJlciBmb3IgcmVxdWVzdHMuCiAJICogVXNpbmcgdGhpcyBudW1iZXIgYWxsb3dzIHRo ZSB3cmFwYXJvdW5kIHRvIGhhcHBlbiBlYXJseSwKQEAgLTUwODYsMTEgKzUwOTUsOCBAQCBpOTE1 X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlkZXZfcHJpdi0+bmV4dF9z ZXFubyA9ICgodTMyKX4wIC0gMHgxMTAwKTsKIAlkZXZfcHJpdi0+bGFzdF9zZXFubyA9ICgodTMy KX4wIC0gMHgxMTAxKTsKIAotCS8qIEluaXRpYWxpemUgZmVuY2UgcmVnaXN0ZXJzIHRvIHplcm8g Ki8KIAlJTklUX0xJU1RfSEVBRCgmZGV2X3ByaXYtPm1tLmZlbmNlX2xpc3QpOwotCWk5MTVfZ2Vt X3Jlc3RvcmVfZmVuY2VzKGRldik7CiAKLQlpOTE1X2dlbV9kZXRlY3RfYml0XzZfc3dpenpsZShk ZXYpOwogCWluaXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5wZW5kaW5nX2ZsaXBfcXVldWUp OwogCiAJZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUgPSB0cnVlOwotLSAKMi41LjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=