From: Maarten Lankhorst Subject: [PATCH] drm/i915: sync dp link status checks against atomic commmits Date: Mon, 13 Nov 2017 14:12:50 +0100 Message-ID: <20171113131250.1122-1-maarten.lankhorst@linux.intel.com> References: <20171110105313.16718-2-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id E75C16E5C6 for ; Mon, 13 Nov 2017 13:12:56 +0000 (UTC) In-Reply-To: <20171110105313.16718-2-daniel.vetter@ffwll.ch> 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: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KClR3byBiaXRzOgot IGNoZWNrIGFjdHVhbCBhdG9taWMgc3RhdGUsIHRoZSBsZWdhY3kgc3R1ZmYgY2FuIG9ubHkgYmUg bG9va2VkIGF0CiAgZnJvbSB3aXRoaW4gdGhlIGF0b21pY19jb21taXRfdGFpbCBmdW5jdGlvbiwg c2luY2UgaXQncyBvbmx5CiAgcHJvdGVjdGVkIGJ5IG9yZGVyaW5nIGFuZCBub3QgYnkgYW55IGxv Y2tzLgoKLSBNYWtlIHN1cmUgd2UgZG9uJ3Qgd3JlYWsgdGhlIHdvcmsgYW4gb25nb2luZyBub25i bG9ja2luZyBjb21taXQgaXMKICBkb2luZy4KCnYyOiBXZSBuZWVkIHRoZSBjcnRjIGxvY2sgdG9v LCBiZWNhdXNlIGEgcGxhbmUgdXBkYXRlIG1pZ2h0IGNoYW5nZSBpdAp3aXRob3V0IGhhdmluZyB0 byBhY3F1aXJlIHRoZSBjb25uZWN0aW9uX211dGV4IChNYWFydGVuKS4gVXNlCk1hYXJ0ZW4ncyBj aGFuZ2VzIGZvciB0aGlzIGxvY2tpbmcsIHdoaWxlIGtlZXBpbmcgdGhlIGxvZ2ljIHRoYXQgdXNl cwp0aGUgY29ubmVjdGlvbi0+Y29tbWl0LT5od19kb25lIHNpZ25hbCBmb3Igc3luY2luZyB3aXRo IG5vbmJsb2NraW5nCmNvbW1pdHMuCgp2MzogVGhlIGluaXRpYWwgc3RhdGUgb2JqZWN0cyBmcm9t IHRoZSBodyBzdGF0ZSByZWFkb3V0IGRvIG5vdCBoYXZlIGEKY29tbWl0IG9iamVjdC4gQ2hlY2sg Zm9yIHRoYXQgKHNwb3R0ZWQgYnkgQ0kpLgoKdjQ6IFJlYmFzZWQuIChtbGFua2hvcnN0KQoKQ2M6 IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5kLm5hdmFyZUBpbnRlbC5jb20+CkNjOiBNYWFydGVuIExh bmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmVmZXJlbmNlczogaHR0cHM6 Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMzM2CkJ1Z3ppbGxhOiBo dHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05OTI3MgpTaWduZWQt b2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgNTYgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MSBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IGY2NTA5 OWFlNGVhOC4uZDFjMzcyMjEzMzVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTQyNzcs NiArNDI3Nyw4IEBAIGludGVsX2RwX2NoZWNrX2xpbmtfc3RhdHVzKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHApCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50 ZWxfZW5jb2RlciA9ICZkcF90b19kaWdfcG9ydChpbnRlbF9kcCktPmJhc2U7CisJc3RydWN0IGRy bV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUgPQorCQlpbnRlbF9kcC0+YXR0YWNoZWRfY29u bmVjdG9yLT5iYXNlLnN0YXRlOwogCXU4IGxpbmtfc3RhdHVzW0RQX0xJTktfU1RBVFVTX1NJWkVd OwogCiAJV0FSTl9PTighZHJtX21vZGVzZXRfaXNfbG9ja2VkKCZkZXZfcHJpdi0+ZHJtLm1vZGVf Y29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpKTsKQEAgLTQyODYsMTAgKzQyODgsMTYgQEAgaW50ZWxf ZHBfY2hlY2tfbGlua19zdGF0dXMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJcmV0dXJu OwogCX0KIAotCWlmICghaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjKQorCWlmICghY29ubl9zdGF0 ZS0+Y3J0YykKIAkJcmV0dXJuOwogCi0JaWYgKCF0b19pbnRlbF9jcnRjKGludGVsX2VuY29kZXIt PmJhc2UuY3J0YyktPmFjdGl2ZSkKKwlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19sb2NrZWQoJmNv bm5fc3RhdGUtPmNydGMtPm11dGV4KSk7CisKKwlpZiAoIWNvbm5fc3RhdGUtPmNydGMtPnN0YXRl LT5hY3RpdmUpCisJCXJldHVybjsKKworCWlmIChjb25uX3N0YXRlLT5jb21taXQgJiYKKwkgICAg IXRyeV93YWl0X2Zvcl9jb21wbGV0aW9uKCZjb25uX3N0YXRlLT5jb21taXQtPmh3X2RvbmUpKQog CQlyZXR1cm47CiAKIAkvKgpAQCAtNDM2NCw5ICs0MzcyLDggQEAgaW50ZWxfZHBfc2hvcnRfcHVs c2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJCURSTV9ERUJVR19EUklWRVIoIkNQIG9y IHNpbmsgc3BlY2lmaWMgaXJxIHVuaGFuZGxlZFxuIik7CiAJfQogCi0JZHJtX21vZGVzZXRfbG9j aygmZGV2X3ByaXYtPmRybS5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCBOVUxMKTsKIAlp bnRlbF9kcF9jaGVja19saW5rX3N0YXR1cyhpbnRlbF9kcCk7Ci0JZHJtX21vZGVzZXRfdW5sb2Nr KCZkZXZfcHJpdi0+ZHJtLm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpOworCiAJaWYgKGlu dGVsX2RwLT5jb21wbGlhbmNlLnRlc3RfdHlwZSA9PSBEUF9URVNUX0xJTktfVFJBSU5JTkcpIHsK IAkJRFJNX0RFQlVHX0tNUygiTGluayBUcmFpbmluZyBDb21wbGlhbmNlIFRlc3QgcmVxdWVzdGVk XG4iKTsKIAkJLyogU2VuZCBhIEhvdHBsdWcgVWV2ZW50IHRvIHVzZXJzcGFjZSB0byBzdGFydCBt b2Rlc2V0ICovCkBAIC00ODE0LDggKzQ4MjEsMTkgQEAgaW50ZWxfZHBfZGV0ZWN0KHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29u bmVjdG9yLT5uYW1lKTsKIAogCS8qIElmIGZ1bGwgZGV0ZWN0IGlzIG5vdCBwZXJmb3JtZWQgeWV0 LCBkbyBhIGZ1bGwgZGV0ZWN0ICovCi0JaWYgKCFpbnRlbF9kcC0+ZGV0ZWN0X2RvbmUpCisJaWYg KCFpbnRlbF9kcC0+ZGV0ZWN0X2RvbmUpIHsKKwkJc3RydWN0IGRybV9jcnRjICpjcnRjOworCQlp bnQgcmV0OworCisJCWNydGMgPSBjb25uZWN0b3ItPnN0YXRlLT5jcnRjOworCQlpZiAoY3J0Yykg eworCQkJcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmY3J0Yy0+bXV0ZXgsIGN0eCk7CisJCQlpZiAo cmV0KQorCQkJCXJldHVybiByZXQ7CisJCX0KKwogCQlzdGF0dXMgPSBpbnRlbF9kcF9sb25nX3B1 bHNlKGludGVsX2RwLT5hdHRhY2hlZF9jb25uZWN0b3IpOworCX0KIAogCWludGVsX2RwLT5kZXRl Y3RfZG9uZSA9IGZhbHNlOwogCkBAIC01MDk3LDEwICs1MTE1LDM4IEBAIGludGVsX2RwX2hwZF9w dWxzZShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwgYm9vbCBsb25n X2hwZCkKIAl9CiAKIAlpZiAoIWludGVsX2RwLT5pc19tc3QpIHsKKwkJc3RydWN0IGRybV9tb2Rl c2V0X2FjcXVpcmVfY3R4IGN0eDsKKwkJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9 ICZpbnRlbF9kcC0+YXR0YWNoZWRfY29ubmVjdG9yLT5iYXNlOworCQlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7CisJCWludCBpcmV0OworCisJCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAw KTsKK3JldHJ5OgorCQlpcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmZGV2X3ByaXYtPmRybS5tb2Rl X2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCAmY3R4KTsKKwkJaWYgKGlyZXQpCisJCQlnb3RvIGVy cjsKKworCQljcnRjID0gY29ubmVjdG9yLT5zdGF0ZS0+Y3J0YzsKKwkJaWYgKGNydGMpIHsKKwkJ CWlyZXQgPSBkcm1fbW9kZXNldF9sb2NrKCZjcnRjLT5tdXRleCwgJmN0eCk7CisJCQlpZiAoaXJl dCkKKwkJCQlnb3RvIGVycjsKKwkJfQorCiAJCWlmICghaW50ZWxfZHBfc2hvcnRfcHVsc2UoaW50 ZWxfZHApKSB7CiAJCQlpbnRlbF9kcC0+ZGV0ZWN0X2RvbmUgPSBmYWxzZTsKIAkJCWdvdG8gcHV0 X3Bvd2VyOwogCQl9CisKK2VycjoKKwkJaWYgKGlyZXQgPT0gLUVERUFETEspIHsKKwkJCWRybV9t b2Rlc2V0X2JhY2tvZmYoJmN0eCk7CisJCQlnb3RvIHJldHJ5OworCQl9CisKKwkJZHJtX21vZGVz ZXRfZHJvcF9sb2NrcygmY3R4KTsKKwkJZHJtX21vZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOwor CQlXQVJOKGlyZXQsICJBY3F1aXJpbmcgbW9kZXNldCBsb2NrcyBmYWlsZWQgd2l0aCAlaVxuIiwg aXJldCk7CiAJfQogCiAJcmV0ID0gSVJRX0hBTkRMRUQ7Ci0tIAoyLjE1LjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=