From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 3/6] drm/i915: Move out non-modeset calls from modeset init and cleanup Date: Mon, 16 Jul 2018 15:38:38 -0700 Message-ID: <20180716223841.5081-3-jose.souza@intel.com> References: <20180716223841.5081-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180716223841.5081-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: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org aTkxNV9sb2FkX21vZGVzZXRfaW5pdCgpIGFuZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoKSB3YXMg aW5pdGlhbGl6aW5nCmFuZCBjbGVhbmluZyB1cCB0aGluZ3MgdGhhdCBpcyBub3QgbW9kZXNldCBv bmx5LgpUaGlzIHdpbGwgbWFrZSBlYXN5IGluaXRpYWxpemUgZHJpdmUgd2l0aG91dCBkaXNwbGF5 IHBhcnQuCgpTaWduZWQtb2ZmLWJ5OiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXph QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgfCA1 NiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAxNiArKystLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAzMSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA5OTc5MjAzOTE3NmYuLjQwMmVk OWI0ZjI5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC02NjUsMjUgKzY2NSwxNSBAQCBz dGF0aWMgaW50IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkvKiBtdXN0IGhhcHBlbiBiZWZvcmUgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KCkgb24g VkxWL0NIViAqLwogCWludGVsX3VwZGF0ZV9yYXdjbGsoZGV2X3ByaXYpOwogCi0JaW50ZWxfcG93 ZXJfZG9tYWluc19pbml0X2h3KGRldl9wcml2LCBmYWxzZSk7Ci0KIAlpbnRlbF9jc3JfdWNvZGVf aW5pdChkZXZfcHJpdik7CiAKLQlyZXQgPSBpbnRlbF9pcnFfaW5zdGFsbChkZXZfcHJpdik7Ci0J aWYgKHJldCkKLQkJZ290byBjbGVhbnVwX2NzcjsKLQogCWludGVsX3NldHVwX2dtYnVzKGRldl9w cml2KTsKIAogCS8qIEltcG9ydGFudDogVGhlIG91dHB1dCBzZXR1cCBmdW5jdGlvbnMgY2FsbGVk IGJ5IG1vZGVzZXRfaW5pdCBuZWVkCiAJICogd29ya2luZyBpcnFzIGZvciBlLmcuIGdtYnVzIGFu ZCBkcCBhdXggdHJhbnNmZXJzLiAqLwogCXJldCA9IGludGVsX21vZGVzZXRfaW5pdChkZXYpOwog CWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9pcnE7Ci0KLQlyZXQgPSBpOTE1X2dlbV9pbml0KGRl dl9wcml2KTsKLQlpZiAocmV0KQotCQlnb3RvIGNsZWFudXBfbW9kZXNldDsKKwkJZ290byBjbGVh bnVwX2dtYnVzOwogCiAJaW50ZWxfc2V0dXBfb3ZlcmxheShkZXZfcHJpdik7CiAKQEAgLTY5Miwy MyArNjgyLDE3IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJcmV0ID0gaW50ZWxfZmJkZXZfaW5pdChkZXYpOwogCWlmIChyZXQp Ci0JCWdvdG8gY2xlYW51cF9nZW07CisJCWdvdG8gY2xlYW51cF9tb2Rlc2V0OwogCiAJLyogT25s eSBlbmFibGUgaG90cGx1ZyBoYW5kbGluZyBvbmNlIHRoZSBmYmRldiBpcyBmdWxseSBzZXQgdXAu ICovCiAJaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYpOwogCiAJcmV0dXJuIDA7CiAKLWNsZWFudXBf Z2VtOgotCWlmIChpOTE1X2dlbV9zdXNwZW5kKGRldl9wcml2KSkKLQkJRFJNX0VSUk9SKCJmYWls ZWQgdG8gaWRsZSBoYXJkd2FyZTsgY29udGludWluZyB0byB1bmxvYWQhXG4iKTsKLQlpOTE1X2dl bV9maW5pKGRldl9wcml2KTsKIGNsZWFudXBfbW9kZXNldDoKIAlpbnRlbF9tb2Rlc2V0X2NsZWFu dXAoZGV2KTsKLWNsZWFudXBfaXJxOgotCWRybV9pcnFfdW5pbnN0YWxsKGRldik7CitjbGVhbnVw X2dtYnVzOgogCWludGVsX3RlYXJkb3duX2dtYnVzKGRldl9wcml2KTsKLWNsZWFudXBfY3NyOgog CWludGVsX2Nzcl91Y29kZV9maW5pKGRldl9wcml2KTsKIAlpbnRlbF9wb3dlcl9kb21haW5zX2Zp bmkoZGV2X3ByaXYpOwogCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50KHBkZXYpOwpA QCAtMTM5NSw5ICsxMzc5LDIyIEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBwY2lfZGV2 ICpwZGV2LCBjb25zdCBzdHJ1Y3QgcGNpX2RldmljZV9pZCAqZW50KQogCQkJZ290byBvdXRfY2xl YW51cF9odzsKIAl9CiAKKwlyZXQgPSBpbnRlbF9pcnFfaW5zdGFsbChkZXZfcHJpdik7CisJaWYg KHJldCkKKwkJZ290byBvdXRfY2xlYW51cF9odzsKKworCS8qIGk5MTVfZ2VtX2luaXQoKSBjYWxs IGNoYWluIHdpbGwgY2FsbAorCSAqIGludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGk5MTUsIFBPV0VS X0RPTUFJTl9HVF9JUlEpOworCSAqLworCWludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdF9odyhkZXZf cHJpdiwgZmFsc2UpOworCisJcmV0ID0gaTkxNV9nZW1faW5pdChkZXZfcHJpdik7CisJaWYgKHJl dCkKKwkJZ290byBjbGVhbnVwX2lycTsKKwogCXJldCA9IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQo JmRldl9wcml2LT5kcm0pOwogCWlmIChyZXQgPCAwKQotCQlnb3RvIG91dF9jbGVhbnVwX2h3Owor CQlnb3RvIGNsZWFudXBfZ2VtOwogCiAJaTkxNV9kcml2ZXJfcmVnaXN0ZXIoZGV2X3ByaXYpOwog CkBAIC0xNDExLDYgKzE0MDgsMTIgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IHBjaV9k ZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAKIAlyZXR1cm4gMDsK IAorY2xlYW51cF9nZW06CisJaWYgKGk5MTVfZ2VtX3N1c3BlbmQoZGV2X3ByaXYpKQorCQlEUk1f RVJST1IoImZhaWxlZCB0byBpZGxlIGhhcmR3YXJlOyBjb250aW51aW5nIHRvIHVubG9hZCFcbiIp OworCWk5MTVfZ2VtX2ZpbmkoZGV2X3ByaXYpOworY2xlYW51cF9pcnE6CisJZHJtX2lycV91bmlu c3RhbGwoJmRldl9wcml2LT5kcm0pOwogb3V0X2NsZWFudXBfaHc6CiAJaTkxNV9kcml2ZXJfY2xl YW51cF9odyhkZXZfcHJpdik7CiBvdXRfY2xlYW51cF9tbWlvOgpAQCAtMTQ0NSw4ICsxNDQ4LDIx IEBAIHZvaWQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlp bnRlbF9ndnRfY2xlYW51cChkZXZfcHJpdik7CiAKKwlpbnRlbF9tb2Rlc2V0X2NsZWFudXBfcHJl cGFyZShkZXYpOworCisJaW50ZWxfZGlzYWJsZV9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOworCisJ LyoKKwkgKiBJbnRlcnJ1cHRzIGFuZCBwb2xsaW5nIGFzIHRoZSBmaXJzdCB0aGluZyB0byBhdm9p ZCBjcmVhdGluZyBoYXZvYy4KKwkgKiBUb28gbXVjaCBzdHVmZiBoZXJlICh0dXJuaW5nIG9mIGNv bm5lY3RvcnMsIC4uLikgd291bGQKKwkgKiBleHBlcmllbmNlIGZhbmN5IHJhY2VzIG90aGVyd2lz ZS4KKwkgKi8KKwlpbnRlbF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKKwogCWludGVsX21vZGVz ZXRfY2xlYW51cChkZXYpOwogCisJaW50ZWxfY2xlYW51cF9ndF9wb3dlcnNhdmUoZGV2X3ByaXYp OworCiAJaW50ZWxfYmlvc19jbGVhbnVwKGRldl9wcml2KTsKIAogCXZnYV9zd2l0Y2hlcm9vX3Vu cmVnaXN0ZXJfY2xpZW50KHBkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNGZiOTM3 Mzk5NDQwLi41MWViNDhmNmI1N2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzQxOSw2 ICszNDE5LDcgQEAgbWt3cml0ZV9kZXZpY2VfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAvKiBtb2Rlc2V0dGluZyAqLwogZXh0ZXJuIHZvaWQgaW50ZWxfbW9kZXNldF9p bml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIGludCBpbnRlbF9tb2Rlc2V0 X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitleHRlcm4gdm9pZCBpbnRlbF9tb2Rlc2V0 X2NsZWFudXBfcHJlcGFyZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiB2b2lkIGlu dGVsX21vZGVzZXRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiBpbnQg aW50ZWxfY29ubmVjdG9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1fY29ubmVjdG9yICopOwogZXh0ZXJu IHZvaWQgaW50ZWxfY29ubmVjdG9yX3VucmVnaXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYmJmNjM3NDFhZTgwLi4xMzZm YjhkNTE5NjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1OTA1LDcg KzE1OTA1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfaHBkX3BvbGxfZmluaShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2VuZCgmY29ubl9pdGVyKTsKIH0K IAotdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3Zv aWQgaW50ZWxfbW9kZXNldF9jbGVhbnVwX3ByZXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAK QEAgLTE1OTEzLDE1ICsxNTkxMywxMSBAQCB2b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJZmx1c2hfd29yaygmZGV2X3ByaXYtPmF0b21pY19oZWxw ZXIuZnJlZV93b3JrKTsKIAlXQVJOX09OKCFsbGlzdF9lbXB0eSgmZGV2X3ByaXYtPmF0b21pY19o ZWxwZXIuZnJlZV9saXN0KSk7Cit9CiAKLQlpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShkZXZf cHJpdik7Ci0KLQkvKgotCSAqIEludGVycnVwdHMgYW5kIHBvbGxpbmcgYXMgdGhlIGZpcnN0IHRo aW5nIHRvIGF2b2lkIGNyZWF0aW5nIGhhdm9jLgotCSAqIFRvbyBtdWNoIHN0dWZmIGhlcmUgKHR1 cm5pbmcgb2YgY29ubmVjdG9ycywgLi4uKSB3b3VsZAotCSAqIGV4cGVyaWVuY2UgZmFuY3kgcmFj ZXMgb3RoZXJ3aXNlLgotCSAqLwotCWludGVsX2lycV91bmluc3RhbGwoZGV2X3ByaXYpOwordm9p ZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAKIAkvKgogCSAq IER1ZSB0byB0aGUgaHBkIGlycSBzdG9ybSBoYW5kbGluZyB0aGUgaG90cGx1ZyB3b3JrIGNhbiBy ZS1hcm0gdGhlCkBAIC0xNTk0Myw4ICsxNTkzOSw2IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9jbGVh bnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbnRlbF9jbGVhbnVwX292ZXJsYXkoZGV2 X3ByaXYpOwogCi0JaW50ZWxfY2xlYW51cF9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOwotCiAJaW50 ZWxfdGVhcmRvd25fZ21idXMoZGV2X3ByaXYpOwogCiAJZGVzdHJveV93b3JrcXVldWUoZGV2X3By aXYtPm1vZGVzZXRfd3EpOwotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK