From: Lyude Paul Subject: [PATCH v8 02/10] drm/i915: Move DP modeset retry work into intel_dp Date: Wed, 11 Apr 2018 19:42:41 -0400 Message-ID: <20180411234302.2896-3-lyude@redhat.com> References: <20180411234302.2896-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180411234302.2896-1-lyude@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: David Airlie , linux-kernel@vger.kernel.org, Manasi Navare , dri-devel@lists.freedesktop.org, Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org V2hpbGUgaGF2aW5nIHRoZSBtb2Rlc2V0X3JldHJ5X3dvcmsgaW4gaW50ZWxfY29ubmVjdG9yIG1h a2VzIHNlbnNlIHdpdGgKU1NULCB0aGlzIHBhcmFkaWdtIGRvZXNuJ3QgbWFrZSBhIHdob2xlIHRv biBvZiBzZW5zZSB3aGVuIGl0IGNvbWVzIHRvCk1TVCBzaW5jZSB3ZSBoYXZlIHRvIGRlYWwgd2l0 aCBtdWx0aXBsZSBjb25uZWN0b3JzLiBJbiBtb3N0IGNhc2VzLCBpdCdzCm1vcmUgdXNlZnVsIHRv IGp1c3QgdXNlIHRoZSBpbnRlbF9kcCBzdHJ1Y3Qgc2luY2UgaXQgaW5kaWNhdGVzIHdoZXRoZXIK b3Igbm90IHdlJ3JlIGRlYWxpbmcgd2l0aCBhbiBNU1QgZGV2aWNlLCBhbG9uZyB3aXRoIGJlaW5n IGFibGUgdG8gZWFzaWx5CnRyYWNlIHRoZSBpbnRlbF9kcCBzdHJ1Y3QgYmFjayB0byBpdCdzIHJl c3BlY3RpdmUgY29ubmVjdG9yIChpZiB0aGVyZSBpcwphbnkpLiBTbywgbW92ZSB0aGUgbW9kZXNl dF9yZXRyeV93b3JrIGZ1bmN0aW9uIG91dCBvZiB0aGUKaW50ZWxfY29ubmVjdG9yIHN0cnVjdCBh bmQgaW50byBpbnRlbF9kcC4KClNpZ25lZC1vZmYtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhh dC5jb20+ClJldmlld2VkLWJ5OiBNYW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwu Y29tPgpDYzogTWFuYXNpIE5hdmFyZSA8bWFuYXNpLmQubmF2YXJlQGludGVsLmNvbT4KQ2M6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CgpWMjoKIC0gUmVt b3ZlIGFjY2lkZW50YWwgZHVwbGljYXRlIG1vZGVzZXRfcmV0cnlfd29yayBpbiBpbnRlbF9jb25u ZWN0b3IKVjM6CiAtIEFsc28gY2hlY2sgYWdhaW5zdCBlRFAgaW4gaW50ZWxfaHBkX3BvbGxfZmlu aSgpIC0gbWRuYXZhcmUKVjQ6CiAtIERvbid0IGJvdGhlciBsb29waW5nIG92ZXIgY29ubmVjdG9y cyBmb3IgY2FuY2VsaW5nIG1vZGVzZXQgcmV0eSB3b3JrLAogICBqdXN0IGVuY29kZXJzLgpWNzoK IC0gRml4IENIRUNLUEFUQ0ggZXJyb3JzCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jICAgICAgICAgIHwgMTQgKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMgICAgICAgICAgICAgICB8IDEwICsrKystLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5pbmcuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICAgICAgfCAgNiArKystLS0KIDQgZmlsZXMgY2hh bmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGUwNDA1MGVhM2UyOC4uMThlZGI5NjI4YTU0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xNTQ3MSwyMCArMTU0NzEsMjggQEAgdm9p ZCBpbnRlbF9jb25uZWN0b3JfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogCiBzdGF0aWMgdm9pZCBpbnRlbF9ocGRfcG9sbF9maW5pKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiB7Ci0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBk cm1fY29ubmVjdG9yX2xpc3RfaXRlciBjb25uX2l0ZXI7CisJc3RydWN0IGludGVsX2Nvbm5lY3Rv ciAqY29ubmVjdG9yOworCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOworCXN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHA7CiAKIAkvKiBLaWxsIGFsbCB0aGUgd29yayB0aGF0IG1heSBoYXZl IGJlZW4gcXVldWVkIGJ5IGhwZC4gKi8KIAlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihk ZXYsICZjb25uX2l0ZXIpOwogCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3Rv ciwgJmNvbm5faXRlcikgewotCQlpZiAoY29ubmVjdG9yLT5tb2Rlc2V0X3JldHJ5X3dvcmsuZnVu YykKLQkJCWNhbmNlbF93b3JrX3N5bmMoJmNvbm5lY3Rvci0+bW9kZXNldF9yZXRyeV93b3JrKTsK IAkJaWYgKGNvbm5lY3Rvci0+aGRjcF9zaGltKSB7CiAJCQljYW5jZWxfZGVsYXllZF93b3JrX3N5 bmMoJmNvbm5lY3Rvci0+aGRjcF9jaGVja193b3JrKTsKIAkJCWNhbmNlbF93b3JrX3N5bmMoJmNv bm5lY3Rvci0+aGRjcF9wcm9wX3dvcmspOwogCQl9CiAJfQogCWRybV9jb25uZWN0b3JfbGlzdF9p dGVyX2VuZCgmY29ubl9pdGVyKTsKKworCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBlbmNv ZGVyKSB7CisJCWlmIChlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9EUCB8fAorCQkgICAg ZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7CisJCQlpbnRlbF9kcCA9IGVuY190 b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7CisJCQljYW5jZWxfd29ya19zeW5jKCZpbnRlbF9k cC0+bW9kZXNldF9yZXRyeV93b3JrKTsKKwkJfQorCX0KIH0KIAogdm9pZCBpbnRlbF9tb2Rlc2V0 X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmlu ZGV4IDYyZjgyYzQyOThhYy4uZmJiNDY3YmMyMjdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMK QEAgLTYyNDksMTIgKzYyNDksMTAgQEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRfY29ubmVj dG9yKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAKIHN0YXRpYyB2b2lkIGludGVsX2RwX21v ZGVzZXRfcmV0cnlfd29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiB7Ci0Jc3RydWN0 IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3I7CisJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGNvbnRhaW5lcl9vZih3 b3JrLCB0eXBlb2YoKmludGVsX2RwKSwKKwkJCQkJCSBtb2Rlc2V0X3JldHJ5X3dvcmspOworCXN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IgPSAmaW50ZWxfZHAtPmF0dGFjaGVkX2Nvbm5l Y3Rvci0+YmFzZTsKIAotCWludGVsX2Nvbm5lY3RvciA9IGNvbnRhaW5lcl9vZih3b3JrLCB0eXBl b2YoKmludGVsX2Nvbm5lY3RvciksCi0JCQkJICAgICAgIG1vZGVzZXRfcmV0cnlfd29yayk7Ci0J Y29ubmVjdG9yID0gJmludGVsX2Nvbm5lY3Rvci0+YmFzZTsKIAlEUk1fREVCVUdfS01TKCJbQ09O TkVDVE9SOiVkOiVzXVxuIiwgY29ubmVjdG9yLT5iYXNlLmlkLAogCQkgICAgICBjb25uZWN0b3It Pm5hbWUpOwogCkBAIC02MjgzLDcgKzYyODEsNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3Rvcihz dHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAlpbnQgdHlwZTsKIAog CS8qIEluaXRpYWxpemUgdGhlIHdvcmsgZm9yIG1vZGVzZXQgaW4gY2FzZSBvZiBsaW5rIHRyYWlu IGZhaWx1cmUgKi8KLQlJTklUX1dPUksoJmludGVsX2Nvbm5lY3Rvci0+bW9kZXNldF9yZXRyeV93 b3JrLAorCUlOSVRfV09SSygmaW50ZWxfZHAtPm1vZGVzZXRfcmV0cnlfd29yaywKIAkJICBpbnRl bF9kcF9tb2Rlc2V0X3JldHJ5X3dvcmtfZm4pOwogCiAJaWYgKFdBUk4oaW50ZWxfZGlnX3BvcnQt Pm1heF9sYW5lcyA8IDEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cF9saW5rX3RyYWluaW5nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9saW5rX3Ry YWluaW5nLmMKaW5kZXggZjU5YjU5YmIwYTIxLi4yY2ZhNThjZTFmOTUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5pbmcuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9saW5rX3RyYWluaW5nLmMKQEAgLTM0MCw3ICszNDAsNyBA QCBpbnRlbF9kcF9zdGFydF9saW5rX3RyYWluKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ CQkJCQkJICAgICBpbnRlbF9kcC0+bGlua19yYXRlLAogCQkJCQkJCSAgICAgaW50ZWxfZHAtPmxh bmVfY291bnQpKQogCQkJLyogU2NoZWR1bGUgYSBIb3RwbHVnIFVldmVudCB0byB1c2Vyc3BhY2Ug dG8gc3RhcnQgbW9kZXNldCAqLwotCQkJc2NoZWR1bGVfd29yaygmaW50ZWxfY29ubmVjdG9yLT5t b2Rlc2V0X3JldHJ5X3dvcmspOworCQkJc2NoZWR1bGVfd29yaygmaW50ZWxfZHAtPm1vZGVzZXRf cmV0cnlfd29yayk7CiAJfSBlbHNlIHsKIAkJRFJNX0VSUk9SKCJbQ09OTkVDVE9SOiVkOiVzXSBM aW5rIFRyYWluaW5nIGZhaWxlZCBhdCBsaW5rIHJhdGUgPSAlZCwgbGFuZSBjb3VudCA9ICVkIiwK IAkJCSAgaW50ZWxfY29ubmVjdG9yLT5iYXNlLmJhc2UuaWQsCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IDViZDIyNjM0MDdiMi4uNzQyZDUzNDk1OTc0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtNDA2LDkgKzQwNiw2IEBAIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgewogCiAJ c3RydWN0IGludGVsX2RwICptc3RfcG9ydDsKIAotCS8qIFdvcmsgc3RydWN0IHRvIHNjaGVkdWxl IGEgdWV2ZW50IG9uIGxpbmsgdHJhaW4gZmFpbHVyZSAqLwotCXN0cnVjdCB3b3JrX3N0cnVjdCBt b2Rlc2V0X3JldHJ5X3dvcms7Ci0KIAljb25zdCBzdHJ1Y3QgaW50ZWxfaGRjcF9zaGltICpoZGNw X3NoaW07CiAJc3RydWN0IG11dGV4IGhkY3BfbXV0ZXg7CiAJdWludDY0X3QgaGRjcF92YWx1ZTsg LyogcHJvdGVjdGVkIGJ5IGhkY3BfbXV0ZXggKi8KQEAgLTExNDMsNiArMTE0MCw5IEBAIHN0cnVj dCBpbnRlbF9kcCB7CiAKIAkvKiBEaXNwbGF5cG9ydCBjb21wbGlhbmNlIHRlc3RpbmcgKi8KIAlz dHJ1Y3QgaW50ZWxfZHBfY29tcGxpYW5jZSBjb21wbGlhbmNlOworCisJLyogV29yayBzdHJ1Y3Qg dG8gc2NoZWR1bGUgYSB1ZXZlbnQgb24gbGluayB0cmFpbiBmYWlsdXJlICovCisJc3RydWN0IHdv cmtfc3RydWN0IG1vZGVzZXRfcmV0cnlfd29yazsKIH07CiAKIHN0cnVjdCBpbnRlbF9sc3Bjb24g ewotLSAKMi4xNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK