From: Lyude Paul Subject: [PATCH v6 02/10] drm/i915: Move DP modeset retry work into intel_dp Date: Wed, 11 Apr 2018 15:29:29 -0400 Message-ID: <20180411192951.21997-3-lyude@redhat.com> References: <20180411192951.21997-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180411192951.21997-1-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 Cc: David Airlie , linux-kernel@vger.kernel.org, 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 cyBmb3IgY2FuY2VsaW5nIG1vZGVzZXQgcmV0eSB3b3JrLAogICBqdXN0IGVuY29kZXJzLgpTaWdu ZWQtb2ZmLWJ5OiBMeXVkZSBQYXVsIDxseXVkZUByZWRoYXQuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICAgICB8IDE0ICsrKysrKysrKysrLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgICAgICAgICAgfCAxMCArKysrLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9saW5rX3RyYWluaW5nLmMgfCAgMiAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgICAgIHwgIDYgKysr LS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlMDQwNTBlYTNlMjguLjE4ZWRi OTYyOGE1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTU0NzEsMjAg KzE1NDcxLDI4IEBAIHZvaWQgaW50ZWxfY29ubmVjdG9yX3VucmVnaXN0ZXIoc3RydWN0IGRybV9j b25uZWN0b3IgKmNvbm5lY3RvcikKIAogc3RhdGljIHZvaWQgaW50ZWxfaHBkX3BvbGxfZmluaShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5l Y3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXIgY29ubl9pdGVyOworCXN0cnVj dCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlcjsKKwlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwOwogCiAJLyogS2lsbCBhbGwgdGhlIHdv cmsgdGhhdCBtYXkgaGF2ZSBiZWVuIHF1ZXVlZCBieSBocGQuICovCiAJZHJtX2Nvbm5lY3Rvcl9s aXN0X2l0ZXJfYmVnaW4oZGV2LCAmY29ubl9pdGVyKTsKIAlmb3JfZWFjaF9pbnRlbF9jb25uZWN0 b3JfaXRlcihjb25uZWN0b3IsICZjb25uX2l0ZXIpIHsKLQkJaWYgKGNvbm5lY3Rvci0+bW9kZXNl dF9yZXRyeV93b3JrLmZ1bmMpCi0JCQljYW5jZWxfd29ya19zeW5jKCZjb25uZWN0b3ItPm1vZGVz ZXRfcmV0cnlfd29yayk7CiAJCWlmIChjb25uZWN0b3ItPmhkY3Bfc2hpbSkgewogCQkJY2FuY2Vs X2RlbGF5ZWRfd29ya19zeW5jKCZjb25uZWN0b3ItPmhkY3BfY2hlY2tfd29yayk7CiAJCQljYW5j ZWxfd29ya19zeW5jKCZjb25uZWN0b3ItPmhkY3BfcHJvcF93b3JrKTsKIAkJfQogCX0KIAlkcm1f Y29ubmVjdG9yX2xpc3RfaXRlcl9lbmQoJmNvbm5faXRlcik7CisKKwlmb3JfZWFjaF9pbnRlbF9l bmNvZGVyKGRldiwgZW5jb2RlcikgeworCQlpZiAoZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQ VVRfRFAgfHwKKwkJICAgIGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkgeworCQkJ aW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCQkJY2FuY2VsX3dv cmtfc3luYygmaW50ZWxfZHAtPm1vZGVzZXRfcmV0cnlfd29yayk7CisJCX0KKwl9CiB9CiAKIHZv aWQgaW50ZWxfbW9kZXNldF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwppbmRleCA2MmY4MmM0Mjk4YWMuLmZiYjQ2N2JjMjI3ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jCkBAIC02MjQ5LDEyICs2MjQ5LDEwIEBAIHN0YXRpYyBib29sIGludGVs X2VkcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCiBzdGF0aWMg dm9pZCBpbnRlbF9kcF9tb2Rlc2V0X3JldHJ5X3dvcmtfZm4oc3RydWN0IHdvcmtfc3RydWN0ICp3 b3JrKQogewotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvcjsKLQlzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAg PSBjb250YWluZXJfb2Yod29yaywgdHlwZW9mKCppbnRlbF9kcCksCisJCQkJCQkgbW9kZXNldF9y ZXRyeV93b3JrKTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yID0gJmludGVsX2Rw LT5hdHRhY2hlZF9jb25uZWN0b3ItPmJhc2U7CiAKLQlpbnRlbF9jb25uZWN0b3IgPSBjb250YWlu ZXJfb2Yod29yaywgdHlwZW9mKCppbnRlbF9jb25uZWN0b3IpLAotCQkJCSAgICAgICBtb2Rlc2V0 X3JldHJ5X3dvcmspOwotCWNvbm5lY3RvciA9ICZpbnRlbF9jb25uZWN0b3ItPmJhc2U7CiAJRFJN X0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc11cbiIsIGNvbm5lY3Rvci0+YmFzZS5pZCwKIAkJ ICAgICAgY29ubmVjdG9yLT5uYW1lKTsKIApAQCAtNjI4Myw3ICs2MjgxLDcgQEAgaW50ZWxfZHBf aW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQs CiAJaW50IHR5cGU7CiAKIAkvKiBJbml0aWFsaXplIHRoZSB3b3JrIGZvciBtb2Rlc2V0IGluIGNh c2Ugb2YgbGluayB0cmFpbiBmYWlsdXJlICovCi0JSU5JVF9XT1JLKCZpbnRlbF9jb25uZWN0b3It Pm1vZGVzZXRfcmV0cnlfd29yaywKKwlJTklUX1dPUksoJmludGVsX2RwLT5tb2Rlc2V0X3JldHJ5 X3dvcmssCiAJCSAgaW50ZWxfZHBfbW9kZXNldF9yZXRyeV93b3JrX2ZuKTsKIAogCWlmIChXQVJO KGludGVsX2RpZ19wb3J0LT5tYXhfbGFuZXMgPCAxLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHBfbGlua190cmFpbmluZy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHBfbGlua190cmFpbmluZy5jCmluZGV4IGY1OWI1OWJiMGEyMS4uMmNmYTU4Y2UxZjk1 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9saW5rX3RyYWluaW5n LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbGlua190cmFpbmluZy5jCkBA IC0zNDAsNyArMzQwLDcgQEAgaW50ZWxfZHBfc3RhcnRfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwKQogCQkJCQkJCSAgICAgaW50ZWxfZHAtPmxpbmtfcmF0ZSwKIAkJCQkJCQkg ICAgIGludGVsX2RwLT5sYW5lX2NvdW50KSkKIAkJCS8qIFNjaGVkdWxlIGEgSG90cGx1ZyBVZXZl bnQgdG8gdXNlcnNwYWNlIHRvIHN0YXJ0IG1vZGVzZXQgKi8KLQkJCXNjaGVkdWxlX3dvcmsoJmlu dGVsX2Nvbm5lY3Rvci0+bW9kZXNldF9yZXRyeV93b3JrKTsKKwkJCXNjaGVkdWxlX3dvcmsoJmlu dGVsX2RwLT5tb2Rlc2V0X3JldHJ5X3dvcmspOwogCX0gZWxzZSB7CiAJCURSTV9FUlJPUigiW0NP Tk5FQ1RPUjolZDolc10gTGluayBUcmFpbmluZyBmYWlsZWQgYXQgbGluayByYXRlID0gJWQsIGxh bmUgY291bnQgPSAlZCIsCiAJCQkgIGludGVsX2Nvbm5lY3Rvci0+YmFzZS5iYXNlLmlkLApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA1YmQyMjYzNDA3YjIuLjc0MmQ1MzQ5NTk3NCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQwNiw5ICs0MDYsNiBAQCBzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yIHsKIAogCXN0cnVjdCBpbnRlbF9kcCAqbXN0X3BvcnQ7CiAKLQkvKiBXb3JrIHN0 cnVjdCB0byBzY2hlZHVsZSBhIHVldmVudCBvbiBsaW5rIHRyYWluIGZhaWx1cmUgKi8KLQlzdHJ1 Y3Qgd29ya19zdHJ1Y3QgbW9kZXNldF9yZXRyeV93b3JrOwotCiAJY29uc3Qgc3RydWN0IGludGVs X2hkY3Bfc2hpbSAqaGRjcF9zaGltOwogCXN0cnVjdCBtdXRleCBoZGNwX211dGV4OwogCXVpbnQ2 NF90IGhkY3BfdmFsdWU7IC8qIHByb3RlY3RlZCBieSBoZGNwX211dGV4ICovCkBAIC0xMTQzLDYg KzExNDAsOSBAQCBzdHJ1Y3QgaW50ZWxfZHAgewogCiAJLyogRGlzcGxheXBvcnQgY29tcGxpYW5j ZSB0ZXN0aW5nICovCiAJc3RydWN0IGludGVsX2RwX2NvbXBsaWFuY2UgY29tcGxpYW5jZTsKKwor CS8qIFdvcmsgc3RydWN0IHRvIHNjaGVkdWxlIGEgdWV2ZW50IG9uIGxpbmsgdHJhaW4gZmFpbHVy ZSAqLworCXN0cnVjdCB3b3JrX3N0cnVjdCBtb2Rlc2V0X3JldHJ5X3dvcms7CiB9OwogCiBzdHJ1 Y3QgaW50ZWxfbHNwY29uIHsKLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==