From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: [PATCH v6 5/6] drm/nouveau: Stop unsetting mstc->port, check connector registration Date: Thu, 15 Nov 2018 19:50:07 -0500 Message-ID: <20181116005008.7243-6-lyude@redhat.com> References: <20181116005008.7243-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181116005008.7243-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org U2FtZSB0aGluZyB3ZSBkaWQgaW4gaTkxNSwgYnV0IGZvciBub3V2ZWF1IG5vdy4KClNpZ25lZC1v ZmYtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxk YW5pZWxAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlz cC5jIHwgMTUgKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCsp LCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rp c3BudjUwL2Rpc3AuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYwpp bmRleCA2Y2JiYWUzZjQzOGIuLmYyMTZmZDQyMDdjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L2Rpc3BudjUwL2Rpc3AuYwpAQCAtNjk4LDggKzY5OCwxMCBAQCBudjUwX21zdG9fY2xlYW51cChz dHJ1Y3QgbnY1MF9tc3RvICptc3RvKQogCXN0cnVjdCBudjUwX21zdG0gKm1zdG0gPSBtc3RjLT5t c3RtOwogCiAJTlZfQVRPTUlDKGRybSwgIiVzOiBtc3RvIGNsZWFudXBcbiIsIG1zdG8tPmVuY29k ZXIubmFtZSk7Ci0JaWYgKG1zdGMtPnBvcnQgJiYgbXN0Yy0+cG9ydC0+dmNwaS52Y3BpID4gMCAm JiAhbnY1MF9tc3RvX3BheWxvYWQobXN0bykpCisJaWYgKCFkcm1fY29ubmVjdG9yX2lzX3VucmVn aXN0ZXJlZCgmbXN0Yy0+Y29ubmVjdG9yKSAmJgorCSAgICBtc3RjLT5wb3J0LT52Y3BpLnZjcGkg PiAwICYmICFudjUwX21zdG9fcGF5bG9hZChtc3RvKSkKIAkJZHJtX2RwX21zdF9kZWFsbG9jYXRl X3ZjcGkoJm1zdG0tPm1nciwgbXN0Yy0+cG9ydCk7CisKIAlpZiAobXN0by0+ZGlzYWJsZWQpIHsK IAkJbXN0by0+bXN0YyA9IE5VTEw7CiAJCW1zdG8tPmhlYWQgPSBOVUxMOwpAQCAtNzI1LDcgKzcy Nyw4IEBAIG52NTBfbXN0b19wcmVwYXJlKHN0cnVjdCBudjUwX21zdG8gKm1zdG8pCiAJfTsKIAog CU5WX0FUT01JQyhkcm0sICIlczogbXN0byBwcmVwYXJlXG4iLCBtc3RvLT5lbmNvZGVyLm5hbWUp OwotCWlmIChtc3RjLT5wb3J0ICYmIG1zdGMtPnBvcnQtPnZjcGkudmNwaSA+IDApIHsKKwlpZiAo IWRybV9jb25uZWN0b3JfaXNfdW5yZWdpc3RlcmVkKCZtc3RjLT5jb25uZWN0b3IpICYmCisJICAg IG1zdGMtPnBvcnQtPnZjcGkudmNwaSA+IDApIHsKIAkJc3RydWN0IGRybV9kcF9wYXlsb2FkICpw YXlsb2FkID0gbnY1MF9tc3RvX3BheWxvYWQobXN0byk7CiAJCWlmIChwYXlsb2FkKSB7CiAJCQlh cmdzLnZjcGkuc3RhcnRfc2xvdCA9IHBheWxvYWQtPnN0YXJ0X3Nsb3Q7CkBAIC04MjIsNyArODI1 LDcgQEAgbnY1MF9tc3RvX2Rpc2FibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCXN0 cnVjdCBudjUwX21zdGMgKm1zdGMgPSBtc3RvLT5tc3RjOwogCXN0cnVjdCBudjUwX21zdG0gKm1z dG0gPSBtc3RjLT5tc3RtOwogCi0JaWYgKG1zdGMtPnBvcnQpCisJaWYgKCFkcm1fY29ubmVjdG9y X2lzX3VucmVnaXN0ZXJlZCgmbXN0Yy0+Y29ubmVjdG9yKSkKIAkJZHJtX2RwX21zdF9yZXNldF92 Y3BpX3Nsb3RzKCZtc3RtLT5tZ3IsIG1zdGMtPnBvcnQpOwogCiAJbXN0bS0+b3V0cC0+dXBkYXRl KG1zdG0tPm91dHAsIG1zdG8tPmhlYWQtPmJhc2UuaW5kZXgsIE5VTEwsIDAsIDApOwpAQCAtOTM1 LDcgKzkzOCw3IEBAIG52NTBfbXN0Y19kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvciwgYm9vbCBmb3JjZSkKIAllbnVtIGRybV9jb25uZWN0b3Jfc3RhdHVzIGNvbm5fc3RhdHVz OwogCWludCByZXQ7CiAKLQlpZiAoIW1zdGMtPnBvcnQpCisJaWYgKGRybV9jb25uZWN0b3JfaXNf dW5yZWdpc3RlcmVkKCZtc3RjLT5jb25uZWN0b3IpKQogCQlyZXR1cm4gY29ubmVjdG9yX3N0YXR1 c19kaXNjb25uZWN0ZWQ7CiAKIAlyZXQgPSBwbV9ydW50aW1lX2dldF9zeW5jKGNvbm5lY3Rvci0+ ZGV2LT5kZXYpOwpAQCAtMTA3MywxMCArMTA3Niw2IEBAIG52NTBfbXN0bV9kZXN0cm95X2Nvbm5l Y3RvcihzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKIAogCWRybV9mYl9oZWxw ZXJfcmVtb3ZlX29uZV9jb25uZWN0b3IoJmRybS0+ZmJjb24tPmhlbHBlciwgJm1zdGMtPmNvbm5l Y3Rvcik7CiAKLQlkcm1fbW9kZXNldF9sb2NrKCZkcm0tPmRldi0+bW9kZV9jb25maWcuY29ubmVj dGlvbl9tdXRleCwgTlVMTCk7Ci0JbXN0Yy0+cG9ydCA9IE5VTEw7Ci0JZHJtX21vZGVzZXRfdW5s b2NrKCZkcm0tPmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCk7Ci0KIAlkcm1fY29u bmVjdG9yX3B1dCgmbXN0Yy0+Y29ubmVjdG9yKTsKIH0KIAotLSAKMi4xOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlz dApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK