From: Lyude Paul Subject: [PATCH v7 02/10] drm/i915: Move DP modeset retry work into intel_dp Date: Wed, 11 Apr 2018 18:54:39 -0400 Message-ID: <20180411225501.26751-3-lyude@redhat.com> References: <20180411225501.26751-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180411225501.26751-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 IC0gRml4IENIRUNLUEFUQ0ggZXJyb3JzClNpZ25lZC1vZmYtYnk6IEx5dWRlIFBhdWwgPGx5dWRl QHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAg ICAgICAgIHwgMTQgKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMgICAgICAgICAgICAgICB8IDEwICsrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwX2xpbmtfdHJhaW5pbmcuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCAgICAgICAgICAgICAgfCAgNiArKystLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTkgaW5z ZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IGUwNDA1MGVhM2UyOC4uMThlZGI5NjI4YTU0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC0xNTQ3MSwyMCArMTU0NzEsMjggQEAgdm9pZCBpbnRlbF9jb25u ZWN0b3JfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCiBzdGF0 aWMgdm9pZCBpbnRlbF9ocGRfcG9sbF9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0J c3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY29ubmVjdG9y X2xpc3RfaXRlciBjb25uX2l0ZXI7CisJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9y OworCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOworCXN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHA7CiAKIAkvKiBLaWxsIGFsbCB0aGUgd29yayB0aGF0IG1heSBoYXZlIGJlZW4gcXVldWVk IGJ5IGhwZC4gKi8KIAlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZjb25uX2l0 ZXIpOwogCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRl cikgewotCQlpZiAoY29ubmVjdG9yLT5tb2Rlc2V0X3JldHJ5X3dvcmsuZnVuYykKLQkJCWNhbmNl bF93b3JrX3N5bmMoJmNvbm5lY3Rvci0+bW9kZXNldF9yZXRyeV93b3JrKTsKIAkJaWYgKGNvbm5l Y3Rvci0+aGRjcF9zaGltKSB7CiAJCQljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmNvbm5lY3Rv ci0+aGRjcF9jaGVja193b3JrKTsKIAkJCWNhbmNlbF93b3JrX3N5bmMoJmNvbm5lY3Rvci0+aGRj cF9wcm9wX3dvcmspOwogCQl9CiAJfQogCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2VuZCgmY29u bl9pdGVyKTsKKworCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBlbmNvZGVyKSB7CisJCWlm IChlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9EUCB8fAorCQkgICAgZW5jb2Rlci0+dHlw ZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7CisJCQlpbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgm ZW5jb2Rlci0+YmFzZSk7CisJCQljYW5jZWxfd29ya19zeW5jKCZpbnRlbF9kcC0+bW9kZXNldF9y ZXRyeV93b3JrKTsKKwkJfQorCX0KIH0KIAogdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFudXAoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDYyZjgyYzQy OThhYy4uZmJiNDY3YmMyMjdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTYyNDksMTIg KzYyNDksMTAgQEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsCiAKIHN0YXRpYyB2b2lkIGludGVsX2RwX21vZGVzZXRfcmV0cnlf d29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiB7Ci0Jc3RydWN0IGludGVsX2Nvbm5l Y3RvciAqaW50ZWxfY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7 CisJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGNvbnRhaW5lcl9vZih3b3JrLCB0eXBlb2Yo KmludGVsX2RwKSwKKwkJCQkJCSBtb2Rlc2V0X3JldHJ5X3dvcmspOworCXN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IgPSAmaW50ZWxfZHAtPmF0dGFjaGVkX2Nvbm5lY3Rvci0+YmFzZTsK IAotCWludGVsX2Nvbm5lY3RvciA9IGNvbnRhaW5lcl9vZih3b3JrLCB0eXBlb2YoKmludGVsX2Nv bm5lY3RvciksCi0JCQkJICAgICAgIG1vZGVzZXRfcmV0cnlfd29yayk7Ci0JY29ubmVjdG9yID0g JmludGVsX2Nvbm5lY3Rvci0+YmFzZTsKIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVz XVxuIiwgY29ubmVjdG9yLT5iYXNlLmlkLAogCQkgICAgICBjb25uZWN0b3ItPm5hbWUpOwogCkBA IC02MjgzLDcgKzYyODEsNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAlpbnQgdHlwZTsKIAogCS8qIEluaXRpYWxp emUgdGhlIHdvcmsgZm9yIG1vZGVzZXQgaW4gY2FzZSBvZiBsaW5rIHRyYWluIGZhaWx1cmUgKi8K LQlJTklUX1dPUksoJmludGVsX2Nvbm5lY3Rvci0+bW9kZXNldF9yZXRyeV93b3JrLAorCUlOSVRf V09SSygmaW50ZWxfZHAtPm1vZGVzZXRfcmV0cnlfd29yaywKIAkJICBpbnRlbF9kcF9tb2Rlc2V0 X3JldHJ5X3dvcmtfZm4pOwogCiAJaWYgKFdBUk4oaW50ZWxfZGlnX3BvcnQtPm1heF9sYW5lcyA8 IDEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9saW5rX3RyYWlu aW5nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9saW5rX3RyYWluaW5nLmMKaW5k ZXggZjU5YjU5YmIwYTIxLi4yY2ZhNThjZTFmOTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5pbmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcF9saW5rX3RyYWluaW5nLmMKQEAgLTM0MCw3ICszNDAsNyBAQCBpbnRlbF9kcF9z dGFydF9saW5rX3RyYWluKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCQkJCQkJICAgICBp bnRlbF9kcC0+bGlua19yYXRlLAogCQkJCQkJCSAgICAgaW50ZWxfZHAtPmxhbmVfY291bnQpKQog CQkJLyogU2NoZWR1bGUgYSBIb3RwbHVnIFVldmVudCB0byB1c2Vyc3BhY2UgdG8gc3RhcnQgbW9k ZXNldCAqLwotCQkJc2NoZWR1bGVfd29yaygmaW50ZWxfY29ubmVjdG9yLT5tb2Rlc2V0X3JldHJ5 X3dvcmspOworCQkJc2NoZWR1bGVfd29yaygmaW50ZWxfZHAtPm1vZGVzZXRfcmV0cnlfd29yayk7 CiAJfSBlbHNlIHsKIAkJRFJNX0VSUk9SKCJbQ09OTkVDVE9SOiVkOiVzXSBMaW5rIFRyYWluaW5n IGZhaWxlZCBhdCBsaW5rIHJhdGUgPSAlZCwgbGFuZSBjb3VudCA9ICVkIiwKIAkJCSAgaW50ZWxf Y29ubmVjdG9yLT5iYXNlLmJhc2UuaWQsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDVi ZDIyNjM0MDdiMi4uNzQyZDUzNDk1OTc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAt NDA2LDkgKzQwNiw2IEBAIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgewogCiAJc3RydWN0IGludGVs X2RwICptc3RfcG9ydDsKIAotCS8qIFdvcmsgc3RydWN0IHRvIHNjaGVkdWxlIGEgdWV2ZW50IG9u IGxpbmsgdHJhaW4gZmFpbHVyZSAqLwotCXN0cnVjdCB3b3JrX3N0cnVjdCBtb2Rlc2V0X3JldHJ5 X3dvcms7Ci0KIAljb25zdCBzdHJ1Y3QgaW50ZWxfaGRjcF9zaGltICpoZGNwX3NoaW07CiAJc3Ry dWN0IG11dGV4IGhkY3BfbXV0ZXg7CiAJdWludDY0X3QgaGRjcF92YWx1ZTsgLyogcHJvdGVjdGVk IGJ5IGhkY3BfbXV0ZXggKi8KQEAgLTExNDMsNiArMTE0MCw5IEBAIHN0cnVjdCBpbnRlbF9kcCB7 CiAKIAkvKiBEaXNwbGF5cG9ydCBjb21wbGlhbmNlIHRlc3RpbmcgKi8KIAlzdHJ1Y3QgaW50ZWxf ZHBfY29tcGxpYW5jZSBjb21wbGlhbmNlOworCisJLyogV29yayBzdHJ1Y3QgdG8gc2NoZWR1bGUg YSB1ZXZlbnQgb24gbGluayB0cmFpbiBmYWlsdXJlICovCisJc3RydWN0IHdvcmtfc3RydWN0IG1v ZGVzZXRfcmV0cnlfd29yazsKIH07CiAKIHN0cnVjdCBpbnRlbF9sc3Bjb24gewotLSAKMi4xNC4z CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK