From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 5/5] drm/i915: Extract gem_init() from modeset_load() Date: Fri, 1 Mar 2019 16:49:35 -0800 Message-ID: <20190302004935.28906-5-jose.souza@intel.com> References: <20190302004935.28906-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F3786E329 for ; Sat, 2 Mar 2019 00:49:40 +0000 (UTC) In-Reply-To: <20190302004935.28906-1-jose.souza@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 , Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org bW9kZXNldF9sb2FkKCkgaXMgZGVmaW5hbGx5IG5vdCB0aGUgcmlnaHQgcGxhY2UgdG8gaW5pdGlh bGl6ZSBnZW0gYnV0Cml0IGlzIHRoZXJlIGJlY2F1c2UgaXQgc2hvdWxkIG9ubHkgYmUgY2FsbGVk IGFmdGVyIGludGVsX21vZGVfaW5pdCgpCmFzIG9uZSBvZiB0aGUgdGFza3Mgb2YgdGhpcyBmdW5j dGlvbiBpcyBjaGVjayBpZiBCSU9TIGhhdmUgYWxyZWFkeQphbGxvY2F0ZWQgYSBmcmFtZWJ1ZmZl ciBhbmQgaWYgc28gcmV1c2UgaXQgdG8gYWNjb21wbGlzaCBhIHNtb290aApib290IHRyYW5zaXRp b24uCgpTbyBoZXJlIGl0IGlzIHNwbGl0aW5nIHRoZSBsb2FkaW5nIGludG8gdHdvIGZ1bmN0aW9u cyBhbmQKaW5pdGlhbGl6aW5nIGdlbSBiZXR3ZWVuIHRob3NlIGZ1bmN0aW9ucy4KCkFsc28gcmVu YW1pbmcgaTkxNV9tb2Rlc2V0X3VubG9hZCgpIHRvIGk5MTVfbW9kZXNldF9iZWdpbl91bmxvYWQo KQphcyBzbyBmYXIgaXQgaXMgb25seSBkb2luZyB0aGlzIGpvYiBhbmQgdGhpcyB3YXkgaXQgY2Fu IGJlIHVzZWQgaW4KdGhlIGVycm9ycyBwYXRocyBvZiBpOTE1X2RyaXZlcl9sb2FkKCkuCgpDYzog THVjYXMgRGUgTWFyY2hpIDxsdWNhcy5kZW1hcmNoaUBpbnRlbC5jb20+CkNjOiBKYW5pIE5pa3Vs YSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb3PDqSBSb2JlcnRvIGRl IFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jIHwgNTggKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKaW5kZXggMmI1Y2U3NjRlNjk0Li5mNDE2M2E4YmIyNDQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwpAQCAtNjM5LDcgKzYzOSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdmdhX3N3 aXRjaGVyb29fY2xpZW50X29wcyBpOTE1X3N3aXRjaGVyb29fb3BzID0gewogCS5jYW5fc3dpdGNo ID0gaTkxNV9zd2l0Y2hlcm9vX2Nhbl9zd2l0Y2gsCiB9OwogCi1zdGF0aWMgdm9pZCBpOTE1X21v ZGVzZXRfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBpOTE1X21v ZGVzZXRfYmVnaW5fdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwpAQCAtNjU2LDcgKzY1Niw3IEBAIHN0YXRpYyB2 b2lkIGk5MTVfbW9kZXNldF91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9j c3JfdWNvZGVfZmluaShkZXZfcHJpdik7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9tb2Rlc2V0X2xv YWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyBpbnQgaTkxNV9tb2Rlc2V0X2JlZ2lu X2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZf cHJpdi0+ZHJtLnBkZXY7CkBAIC03MDEsOSArNzAxLDIyIEBAIHN0YXRpYyBpbnQgaTkxNV9tb2Rl c2V0X2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAocmV0KQogCQlnb3RvIGNsZWFu dXBfZ21idXM7CiAKLQlyZXQgPSBpOTE1X2dlbV9pbml0KGRldl9wcml2KTsKLQlpZiAocmV0KQot CQlnb3RvIGNsZWFudXBfbW9kZXNldDsKKwlyZXR1cm4gMDsKKworY2xlYW51cF9nbWJ1czoKKwlp bnRlbF90ZWFyZG93bl9nbWJ1cyhkZXZfcHJpdik7CisJaW50ZWxfY3NyX3Vjb2RlX2ZpbmkoZGV2 X3ByaXYpOworCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50KHBkZXYpOworY2xlYW51 cF92Z2FfY2xpZW50OgorCXZnYV9jbGllbnRfcmVnaXN0ZXIocGRldiwgTlVMTCwgTlVMTCwgTlVM TCk7CitvdXQ6CisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIGludCBpOTE1X21vZGVzZXRfZmlu aXNoX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJaW50IHJldDsKIAogCWludGVsX292ZXJs YXlfc2V0dXAoZGV2X3ByaXYpOwogCkBAIC03MTIsNyArNzI1LDcgQEAgc3RhdGljIGludCBpOTE1 X21vZGVzZXRfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJcmV0ID0gaW50ZWxfZmJk ZXZfaW5pdChkZXYpOwogCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9nZW07CisJCXJldHVybiBy ZXQ7CiAKIAkvKiBPbmx5IGVuYWJsZSBob3RwbHVnIGhhbmRsaW5nIG9uY2UgdGhlIGZiZGV2IGlz IGZ1bGx5IHNldCB1cC4gKi8KIAlpbnRlbF9ocGRfaW5pdChkZXZfcHJpdik7CkBAIC03MjAsMjEg KzczMyw2IEBAIHN0YXRpYyBpbnQgaTkxNV9tb2Rlc2V0X2xvYWQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlpbnRlbF9pbml0X2lwYyhkZXZfcHJpdik7CiAKIAlyZXR1cm4gMDsKLQotY2xlYW51 cF9nZW06Ci0JaWYgKGk5MTVfZ2VtX3N1c3BlbmQoZGV2X3ByaXYpKQotCQlEUk1fRVJST1IoImZh aWxlZCB0byBpZGxlIGhhcmR3YXJlOyBjb250aW51aW5nIHRvIHVubG9hZCFcbiIpOwotCWk5MTVf Z2VtX2ZpbmkoZGV2X3ByaXYpOwotY2xlYW51cF9tb2Rlc2V0OgotCWludGVsX21vZGVzZXRfY2xl YW51cChkZXYpOwotY2xlYW51cF9nbWJ1czoKLQlpbnRlbF90ZWFyZG93bl9nbWJ1cyhkZXZfcHJp dik7Ci0JaW50ZWxfY3NyX3Vjb2RlX2ZpbmkoZGV2X3ByaXYpOwotCXZnYV9zd2l0Y2hlcm9vX3Vu cmVnaXN0ZXJfY2xpZW50KHBkZXYpOwotY2xlYW51cF92Z2FfY2xpZW50OgotCXZnYV9jbGllbnRf cmVnaXN0ZXIocGRldiwgTlVMTCwgTlVMTCwgTlVMTCk7Ci1vdXQ6Ci0JcmV0dXJuIHJldDsKIH0K IAogc3RhdGljIGludCBpOTE1X2tpY2tfb3V0X2Zpcm13YXJlX2ZiKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKQEAgLTE3NjIsMTAgKzE3NjAsMTggQEAgaW50IGk5MTVfZHJpdmVy X2xvYWQoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICpl bnQpCiAJaWYgKHJldCkKIAkJZ290byBvdXRfY2xlYW51cF9wb3dlcjsKIAotCXJldCA9IGk5MTVf bW9kZXNldF9sb2FkKCZkZXZfcHJpdi0+ZHJtKTsKKwlyZXQgPSBpOTE1X21vZGVzZXRfYmVnaW5f bG9hZCgmZGV2X3ByaXYtPmRybSk7CiAJaWYgKHJldCA8IDApCiAJCWdvdG8gb3V0X2NsZWFudXBf aXJxOwogCisJcmV0ID0gaTkxNV9nZW1faW5pdChkZXZfcHJpdik7CisJaWYgKHJldCkKKwkJZ290 byBvdXRfY2xlYW51cF9tb2Rlc2V0X2JlZ2luX2xvYWQ7CisKKwlyZXQgPSBpOTE1X21vZGVzZXRf ZmluaXNoX2xvYWQoJmRldl9wcml2LT5kcm0pOworCWlmIChyZXQgPCAwKQorCQlnb3RvIG91dF9j bGVhbnVwX2dlbTsKKwogCWk5MTVfZHJpdmVyX3JlZ2lzdGVyKGRldl9wcml2KTsKIAogCWVuYWJs ZV9ycG1fd2FrZXJlZl9hc3NlcnRzKGRldl9wcml2KTsKQEAgLTE3NzQsNiArMTc4MCwxMiBAQCBp bnQgaTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3QgcGNpX2RldiAqcGRldiwgY29uc3Qgc3RydWN0IHBj aV9kZXZpY2VfaWQgKmVudCkKIAogCXJldHVybiAwOwogCitvdXRfY2xlYW51cF9nZW06CisJaWYg KGk5MTVfZ2VtX3N1c3BlbmQoZGV2X3ByaXYpKQorCQlEUk1fRVJST1IoImZhaWxlZCB0byBpZGxl IGhhcmR3YXJlOyBjb250aW51aW5nIHRvIHVubG9hZCFcbiIpOworCWk5MTVfZ2VtX2ZpbmkoZGV2 X3ByaXYpOworb3V0X2NsZWFudXBfbW9kZXNldF9iZWdpbl9sb2FkOgorCWk5MTVfbW9kZXNldF9i ZWdpbl91bmxvYWQoJmRldl9wcml2LT5kcm0pOwogb3V0X2NsZWFudXBfaXJxOgogCWRybV9pcnFf dW5pbnN0YWxsKCZkZXZfcHJpdi0+ZHJtKTsKIG91dF9jbGVhbnVwX3Bvd2VyOgpAQCAtMTgxNyw3 ICsxODI5LDcgQEAgdm9pZCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkgKi8KIAlpbnRlbF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKIAotCWk5MTVfbW9kZXNl dF91bmxvYWQoZGV2KTsKKwlpOTE1X21vZGVzZXRfYmVnaW5fdW5sb2FkKGRldik7CiAKIAkvKiBG cmVlIGVycm9yIHN0YXRlIGFmdGVyIGludGVycnVwdHMgYXJlIGZ1bGx5IGRpc2FibGVkLiAqLwog CWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmZGV2X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tf d29yayk7Ci0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeA==