From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: [PATCH v2 2/6] drm/i915: Move DP modeset retry work into intel_dp Date: Thu, 8 Mar 2018 18:41:22 -0500 Message-ID: <20180308234122.16641-1-lyude@redhat.com> References: <20180308232421.14049-3-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180308232421.14049-3-lyude@redhat.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, dri-devel@lists.freedesktop.org Cc: David Airlie , linux-kernel@vger.kernel.org, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2hpbGUgaGF2aW5nIHRoZSBtb2Rlc2V0X3JldHJ5X3dvcmsgaW4gaW50ZWxfY29ubmVjdG9yIG1h a2VzIHNlbnNlIHdpdGgKU1NULCB0aGlzIHBhcmFkaWdtIGRvZXNuJ3QgbWFrZSBhIHdob2xlIHRv biBvZiBzZW5zZSB3aGVuIGl0IGNvbWVzIHRvCk1TVCBzaW5jZSB3ZSBoYXZlIHRvIGRlYWwgd2l0 aCBtdWx0aXBsZSBjb25uZWN0b3JzLiBJbiBtb3N0IGNhc2VzLCBpdCdzCm1vcmUgdXNlZnVsIHRv IGp1c3QgdXNlIHRoZSBpbnRlbF9kcCBzdHJ1Y3Qgc2luY2UgaXQgaW5kaWNhdGVzIHdoZXRoZXIK b3Igbm90IHdlJ3JlIGRlYWxpbmcgd2l0aCBhbiBNU1QgZGV2aWNlLCBhbG9uZyB3aXRoIGJlaW5n IGFibGUgdG8gZWFzaWx5CnRyYWNlIHRoZSBpbnRlbF9kcCBzdHJ1Y3QgYmFjayB0byBpdCdzIHJl c3BlY3RpdmUgY29ubmVjdG9yIChpZiB0aGVyZSBpcwphbnkpLiBTbywgbW92ZSB0aGUgbW9kZXNl dF9yZXRyeV93b3JrIGZ1bmN0aW9uIG91dCBvZiB0aGUKaW50ZWxfY29ubmVjdG9yIHN0cnVjdCBh bmQgaW50byBpbnRlbF9kcC4KClYyOgogLSBSZW1vdmUgYWNjaWRlbnRhbCBkdXBsaWNhdGUgbW9k ZXNldF9yZXRyeV93b3JrIGluIGludGVsX2Nvbm5lY3RvcgoKU2lnbmVkLW9mZi1ieTogTHl1ZGUg UGF1bCA8bHl1ZGVAcmVkaGF0LmNvbT4KQ2M6IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5kLm5hdmFy ZUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICAg ICB8IDIzICsrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jICAgICAgICAgICAgICAgfCAxMCArKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcF9saW5rX3RyYWluaW5nLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggICAgICAgICAgICAgIHwgIDYgKysrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI5 IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCBmNDI0ZmZmNDc3ZjYuLjg1ZDVhZjRlNGY1YiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUzOTQsMTYgKzE1Mzk0LDM1IEBAIHN0YXRpYyB2b2lk IGludGVsX2hwZF9wb2xsX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg aW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CiAJc3RydWN0IGRybV9jb25uZWN0b3JfbGlzdF9p dGVyIGNvbm5faXRlcjsKKwlzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcms7CiAKIAkvKiBLaWxsIGFs bCB0aGUgd29yayB0aGF0IG1heSBoYXZlIGJlZW4gcXVldWVkIGJ5IGhwZC4gKi8KIAlkcm1fY29u bmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZjb25uX2l0ZXIpOwogCWZvcl9lYWNoX2ludGVs X2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikgewotCQlpZiAoY29ubmVjdG9y LT5tb2Rlc2V0X3JldHJ5X3dvcmsuZnVuYykKLQkJCWNhbmNlbF93b3JrX3N5bmMoJmNvbm5lY3Rv ci0+bW9kZXNldF9yZXRyeV93b3JrKTsKIAkJaWYgKGNvbm5lY3Rvci0+aGRjcF9zaGltKSB7CiAJ CQljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmNvbm5lY3Rvci0+aGRjcF9jaGVja193b3JrKTsK IAkJCWNhbmNlbF93b3JrX3N5bmMoJmNvbm5lY3Rvci0+aGRjcF9wcm9wX3dvcmspOwogCQl9CisK KwkJaWYgKGNvbm5lY3Rvci0+YmFzZS5jb25uZWN0b3JfdHlwZSAhPQorCQkgICAgRFJNX01PREVf Q09OTkVDVE9SX0Rpc3BsYXlQb3J0KQorCQkJY29udGludWU7CisKKwkJaWYgKGNvbm5lY3Rvci0+ bXN0X3BvcnQpIHsKKwkJCXdvcmsgPSAmY29ubmVjdG9yLT5tc3RfcG9ydC0+bW9kZXNldF9yZXRy eV93b3JrOworCQl9IGVsc2UgeworCQkJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29k ZXIgPQorCQkJCWNvbm5lY3Rvci0+ZW5jb2RlcjsKKwkJCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHA7CisKKwkJCWlmICghaW50ZWxfZW5jb2RlcikKKwkJCQljb250aW51ZTsKKworCQkJaW50ZWxf ZHAgPSBlbmNfdG9faW50ZWxfZHAoJmludGVsX2VuY29kZXItPmJhc2UpOworCQkJd29yayA9ICZp bnRlbF9kcC0+bW9kZXNldF9yZXRyeV93b3JrOworCQl9CisKKwkJY2FuY2VsX3dvcmtfc3luYyh3 b3JrKTsKIAl9CiAJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfZW5kKCZjb25uX2l0ZXIpOwogfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggNGRkMWIyMjg3ZGQ2Li41YWJmMGM5NTcyNWEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNjI2MSwxMiArNjI2MSwxMCBAQCBzdGF0aWMgYm9v bCBpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAog c3RhdGljIHZvaWQgaW50ZWxfZHBfbW9kZXNldF9yZXRyeV93b3JrX2ZuKHN0cnVjdCB3b3JrX3N0 cnVjdCAqd29yaykKIHsKLQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3I7 Ci0Jc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwID0gY29udGFpbmVyX29mKHdvcmssIHR5cGVvZigqaW50ZWxfZHApLAorCQkJCQkJIG1v ZGVzZXRfcmV0cnlfd29yayk7CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9ICZp bnRlbF9kcC0+YXR0YWNoZWRfY29ubmVjdG9yLT5iYXNlOwogCi0JaW50ZWxfY29ubmVjdG9yID0g Y29udGFpbmVyX29mKHdvcmssIHR5cGVvZigqaW50ZWxfY29ubmVjdG9yKSwKLQkJCQkgICAgICAg bW9kZXNldF9yZXRyeV93b3JrKTsKLQljb25uZWN0b3IgPSAmaW50ZWxfY29ubmVjdG9yLT5iYXNl OwogCURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdXG4iLCBjb25uZWN0b3ItPmJhc2Uu aWQsCiAJCSAgICAgIGNvbm5lY3Rvci0+bmFtZSk7CiAKQEAgLTYyOTUsNyArNjI5Myw3IEBAIGlu dGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2Rp Z19wb3J0LAogCWludCB0eXBlOwogCiAJLyogSW5pdGlhbGl6ZSB0aGUgd29yayBmb3IgbW9kZXNl dCBpbiBjYXNlIG9mIGxpbmsgdHJhaW4gZmFpbHVyZSAqLwotCUlOSVRfV09SSygmaW50ZWxfY29u bmVjdG9yLT5tb2Rlc2V0X3JldHJ5X3dvcmssCisJSU5JVF9XT1JLKCZpbnRlbF9kcC0+bW9kZXNl dF9yZXRyeV93b3JrLAogCQkgIGludGVsX2RwX21vZGVzZXRfcmV0cnlfd29ya19mbik7CiAKIAlp ZiAoV0FSTihpbnRlbF9kaWdfcG9ydC0+bWF4X2xhbmVzIDwgMSwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5pbmcuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5pbmcuYwppbmRleCBmNTliNTliYjBhMjEuLjJjZmE1 OGNlMWY5NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbGlua190 cmFpbmluZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5p bmcuYwpAQCAtMzQwLDcgKzM0MCw3IEBAIGludGVsX2RwX3N0YXJ0X2xpbmtfdHJhaW4oc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCkKIAkJCQkJCQkgICAgIGludGVsX2RwLT5saW5rX3JhdGUsCiAJ CQkJCQkJICAgICBpbnRlbF9kcC0+bGFuZV9jb3VudCkpCiAJCQkvKiBTY2hlZHVsZSBhIEhvdHBs dWcgVWV2ZW50IHRvIHVzZXJzcGFjZSB0byBzdGFydCBtb2Rlc2V0ICovCi0JCQlzY2hlZHVsZV93 b3JrKCZpbnRlbF9jb25uZWN0b3ItPm1vZGVzZXRfcmV0cnlfd29yayk7CisJCQlzY2hlZHVsZV93 b3JrKCZpbnRlbF9kcC0+bW9kZXNldF9yZXRyeV93b3JrKTsKIAl9IGVsc2UgewogCQlEUk1fRVJS T1IoIltDT05ORUNUT1I6JWQ6JXNdIExpbmsgVHJhaW5pbmcgZmFpbGVkIGF0IGxpbmsgcmF0ZSA9 ICVkLCBsYW5lIGNvdW50ID0gJWQiLAogCQkJICBpbnRlbF9jb25uZWN0b3ItPmJhc2UuYmFzZS5p ZCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggODNlNWNhODg5ZDljLi4zZjE5ZGM4MDk5 N2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00MDYsOSArNDA2LDYgQEAgc3RydWN0 IGludGVsX2Nvbm5lY3RvciB7CiAKIAlzdHJ1Y3QgaW50ZWxfZHAgKm1zdF9wb3J0OwogCi0JLyog V29yayBzdHJ1Y3QgdG8gc2NoZWR1bGUgYSB1ZXZlbnQgb24gbGluayB0cmFpbiBmYWlsdXJlICov Ci0Jc3RydWN0IHdvcmtfc3RydWN0IG1vZGVzZXRfcmV0cnlfd29yazsKLQogCWNvbnN0IHN0cnVj dCBpbnRlbF9oZGNwX3NoaW0gKmhkY3Bfc2hpbTsKIAlzdHJ1Y3QgbXV0ZXggaGRjcF9tdXRleDsK IAl1aW50NjRfdCBoZGNwX3ZhbHVlOyAvKiBwcm90ZWN0ZWQgYnkgaGRjcF9tdXRleCAqLwpAQCAt MTEzNSw2ICsxMTMyLDkgQEAgc3RydWN0IGludGVsX2RwIHsKIAogCS8qIERpc3BsYXlwb3J0IGNv bXBsaWFuY2UgdGVzdGluZyAqLwogCXN0cnVjdCBpbnRlbF9kcF9jb21wbGlhbmNlIGNvbXBsaWFu Y2U7CisKKwkvKiBXb3JrIHN0cnVjdCB0byBzY2hlZHVsZSBhIHVldmVudCBvbiBsaW5rIHRyYWlu IGZhaWx1cmUgKi8KKwlzdHJ1Y3Qgd29ya19zdHJ1Y3QgbW9kZXNldF9yZXRyeV93b3JrOwogfTsK IAogc3RydWN0IGludGVsX2xzcGNvbiB7Ci0tIAoyLjE0LjMKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=