From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v4 07/19] drm/i915: Move load time gem_load_init earlier Date: Wed, 16 Mar 2016 14:54:03 +0200 Message-ID: <1458132843-21860-1-git-send-email-imre.deak@intel.com> References: <1458128348-15730-8-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 91D516E90D for ; Wed, 16 Mar 2016 12:54:06 +0000 (UTC) In-Reply-To: <1458128348-15730-8-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 cmxpZXIuCgp2Mi12MzoKLSB1bmNoYW5nZWQKdjQ6Ci0gbW92ZSBjYWxsIHRvIGk5MTVfZ2VtX2Rl dGVjdF9iaXRfNl9zd2l6emxlKCkgdG8KICBpOTE1X2dlbV9sb2FkX2luaXRfZmVuY2VzKCkgYW5k IHByZXNlcnZlIHRoZSBvcmlnaW5hbCBvcmRlciBvZgogIHRoZSBkZXRlY3Rpb24gb2YgSFcgZmVu Y2UgY2FwYWlsaXRpZXMgd3J0LiBzd2l6emxpbmcgKENocmlzKQoKQ0M6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUu ZGVha0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwgMTIgKysr KysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDEgKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDM4ICsrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDE5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IGRhOTZjY2QuLjBlNjhmMWUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtMTAzMSw2ICsxMDMxLDcgQEAgaW50IGk5MTVfZHJp dmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAlp bnRlbF9pbml0X2Rpc3BsYXlfaG9va3MoZGV2X3ByaXYpOwogCWludGVsX2luaXRfY2xvY2tfZ2F0 aW5nX2hvb2tzKGRldl9wcml2KTsKIAlpbnRlbF9pbml0X2F1ZGlvX2hvb2tzKGRldl9wcml2KTsK KwlpOTE1X2dlbV9sb2FkX2luaXQoZGV2KTsKIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9w cml2KTsKIApAQCAtMTExNCw3ICsxMTE1LDggQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAogCWludGVsX29wcmVnaW9u X3NldHVwKGRldik7CiAKLQlpOTE1X2dlbV9sb2FkX2luaXQoZGV2KTsKKwlpOTE1X2dlbV9sb2Fk X2luaXRfZmVuY2VzKGRldl9wcml2KTsKKwogCWk5MTVfZ2VtX3Nocmlua2VyX2luaXQoZGV2X3By aXYpOwogCiAJLyogT24gdGhlIDk0NUcvR00sIHRoZSBjaGlwc2V0IHJlcG9ydHMgdGhlIE1TSSBj YXBhYmlsaXR5IG9uIHRoZQpAQCAtMTEzNiw3ICsxMTM4LDcgQEAgaW50IGk5MTVfZHJpdmVyX2xv YWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAlpZiAoSU5U RUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpIHsKIAkJcmV0ID0gZHJtX3ZibGFua19pbml0KGRldiwg SU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpOwogCQlpZiAocmV0KQotCQkJZ290byBvdXRfZ2Vt X3VubG9hZDsKKwkJCWdvdG8gb3V0X2NsZWFudXBfc2hyaW5rZXI7CiAJfQogCiAJcmV0ID0gaTkx NV9sb2FkX21vZGVzZXRfaW5pdChkZXYpOwpAQCAtMTE3NCw3ICsxMTc2LDcgQEAgaW50IGk5MTVf ZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykK IG91dF9wb3dlcl93ZWxsOgogCWludGVsX3Bvd2VyX2RvbWFpbnNfZmluaShkZXZfcHJpdik7CiAJ ZHJtX3ZibGFua19jbGVhbnVwKGRldik7Ci1vdXRfZ2VtX3VubG9hZDoKK291dF9jbGVhbnVwX3No cmlua2VyOgogCWk5MTVfZ2VtX3Nocmlua2VyX2NsZWFudXAoZGV2X3ByaXYpOwogCiAJaWYgKGRl di0+cGRldi0+bXNpX2VuYWJsZWQpCkBAIC0xMTkwLDkgKzExOTIsOSBAQCBvdXRfdW5jb3JlX2Zp bmk6CiAJaTkxNV9tbWlvX2NsZWFudXAoZGV2KTsKIHB1dF9icmlkZ2U6CiAJcGNpX2Rldl9wdXQo ZGV2X3ByaXYtPmJyaWRnZV9kZXYpOwotCWk5MTVfZ2VtX2xvYWRfY2xlYW51cChkZXYpOwogb3V0 X3J1bnRpbWVfcG1fcHV0OgogCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKKwlpOTE1 X2dlbV9sb2FkX2NsZWFudXAoZGV2KTsKIAlpOTE1X3dvcmtxdWV1ZXNfY2xlYW51cChkZXZfcHJp dik7CiBvdXRfZnJlZV9wcml2OgogCWtmcmVlKGRldl9wcml2KTsKQEAgLTEyNzcsOCArMTI3OSw4 IEBAIGludCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRl bF91bmNvcmVfZmluaShkZXYpOwogCWk5MTVfbW1pb19jbGVhbnVwKGRldik7CiAKLQlpOTE1X2dl bV9sb2FkX2NsZWFudXAoZGV2KTsKIAlwY2lfZGV2X3B1dChkZXZfcHJpdi0+YnJpZGdlX2Rldik7 CisJaTkxNV9nZW1fbG9hZF9jbGVhbnVwKGRldik7CiAJaTkxNV93b3JrcXVldWVzX2NsZWFudXAo ZGV2X3ByaXYpOwogCWtmcmVlKGRldl9wcml2KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5k ZXggODBiMTRmMS4uMjUyNzRlMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yODM2LDYg KzI4MzYsNyBAQCBpbnQgaTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB2b2lkICpkYXRhLAogCQkJc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwogdm9pZCBpOTE1 X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2xv YWRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9nZW1fbG9hZF9p bml0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCAqaTkx NV9nZW1fb2JqZWN0X2FsbG9jKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpOTE1X2dl bV9vYmplY3RfZnJlZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIHZvaWQgaTkx NV9nZW1fb2JqZWN0X2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCmluZGV4IGI4NTRhZjIuLjA3ODQ4ZjggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwpAQCAtNTAyOSw2ICs1MDI5LDMwIEBAIGluaXRfcmluZ19saXN0cyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKQogfQogCiB2b2lkCitpOTE1X2dlbV9sb2FkX2luaXRfZmVuY2Vz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKKworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2Vu ID49IDcgJiYgIUlTX1ZBTExFWVZJRVcoZGV2X3ByaXYpICYmCisJICAgICFJU19DSEVSUllWSUVX KGRldl9wcml2KSkKKwkJZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzID0gMzI7CisJZWxzZSBpZiAo SU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA0IHx8IElTX0k5NDVHKGRldl9wcml2KSB8fAor CQkgSVNfSTk0NUdNKGRldl9wcml2KSB8fCBJU19HMzMoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ bnVtX2ZlbmNlX3JlZ3MgPSAxNjsKKwllbHNlCisJCWRldl9wcml2LT5udW1fZmVuY2VfcmVncyA9 IDg7CisKKwlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2KSkKKwkJZGV2X3ByaXYtPm51bV9mZW5j ZV9yZWdzID0KKwkJCQlJOTE1X1JFQUQodmd0aWZfcmVnKGF2YWlsX3JzLmZlbmNlX251bSkpOwor CisJLyogSW5pdGlhbGl6ZSBmZW5jZSByZWdpc3RlcnMgdG8gemVybyAqLworCWk5MTVfZ2VtX3Jl c3RvcmVfZmVuY2VzKGRldik7CisKKwlpOTE1X2dlbV9kZXRlY3RfYml0XzZfc3dpenpsZShkZXYp OworfQorCit2b2lkCiBpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwpAQCAtNTA2NywxNyArNTA5MSw2IEBAIGk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCiAJZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlID0gSTkxNV9F WEVDX0NPTlNUQU5UU19SRUxfR0VORVJBTDsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+ PSA3ICYmICFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSkKLQkJZGV2 X3ByaXYtPm51bV9mZW5jZV9yZWdzID0gMzI7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gNCB8fCBJU19JOTQ1RyhkZXYpIHx8IElTX0k5NDVHTShkZXYpIHx8IElTX0czMyhkZXYp KQotCQlkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPSAxNjsKLQllbHNlCi0JCWRldl9wcml2LT5u dW1fZmVuY2VfcmVncyA9IDg7Ci0KLQlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2KSkKLQkJZGV2 X3ByaXYtPm51bV9mZW5jZV9yZWdzID0KLQkJCQlJOTE1X1JFQUQodmd0aWZfcmVnKGF2YWlsX3Jz LmZlbmNlX251bSkpOwotCiAJLyoKIAkgKiBTZXQgaW5pdGlhbCBzZXF1ZW5jZSBudW1iZXIgZm9y IHJlcXVlc3RzLgogCSAqIFVzaW5nIHRoaXMgbnVtYmVyIGFsbG93cyB0aGUgd3JhcGFyb3VuZCB0 byBoYXBwZW4gZWFybHksCkBAIC01MDg2LDExICs1MDk5LDggQEAgaTkxNV9nZW1fbG9hZF9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2X3ByaXYtPm5leHRfc2Vxbm8gPSAoKHUzMil+ MCAtIDB4MTEwMCk7CiAJZGV2X3ByaXYtPmxhc3Rfc2Vxbm8gPSAoKHUzMil+MCAtIDB4MTEwMSk7 CiAKLQkvKiBJbml0aWFsaXplIGZlbmNlIHJlZ2lzdGVycyB0byB6ZXJvICovCiAJSU5JVF9MSVNU X0hFQUQoJmRldl9wcml2LT5tbS5mZW5jZV9saXN0KTsKLQlpOTE1X2dlbV9yZXN0b3JlX2ZlbmNl cyhkZXYpOwogCi0JaTkxNV9nZW1fZGV0ZWN0X2JpdF82X3N3aXp6bGUoZGV2KTsKIAlpbml0X3dh aXRxdWV1ZV9oZWFkKCZkZXZfcHJpdi0+cGVuZGluZ19mbGlwX3F1ZXVlKTsKIAogCWRldl9wcml2 LT5tbS5pbnRlcnJ1cHRpYmxlID0gdHJ1ZTsKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK