From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915/dp: Fix alt mode handling. Date: Tue, 13 Mar 2018 14:52:35 +0100 Message-ID: <20180313135235.13686-1-maarten.lankhorst@linux.intel.com> References: <20180313131143.GV5453@intel.com> 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 CD5246E507 for ; Tue, 13 Mar 2018 13:52:41 +0000 (UTC) In-Reply-To: <20180313131143.GV5453@intel.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: Paulo Zanoni , Jani Nikula , stable@vger.kernel.org, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gZmktY25sLXkzIHdlIGhhdmUgMiBtb2RlcyB0aGF0IGRpZmZlciBvbmx5IGJ5IGNydGNfY2xv Y2suIFRoaXMgbWVhbnMKdGhhdCBpZiB3ZSByZXF1ZXN0IHRoZSBub3JtYWwgbW9kZSwgd2UgYXV0 b21hdGljYWxseSBnZXQgdGhlIGRvd25jbG9ja2VkCm1vZGUuCgpUaGlzIGNhbiBiZSBzZWVuIGR1 cmluZyBib290OgpbZHJtOmRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2Rlc10g W0NPTk5FQ1RPUjoxMDE6ZURQLTFdIHByb2JlZCBtb2RlcyA6Cltkcm06ZHJtX21vZGVfZGVidWdf cHJpbnRtb2RlbGluZV0gTW9kZWxpbmUgMTAyOiIzODQweDIxNjAiIDYwIDUzMzI1MCAzODQwIDM4 ODggMzkyMCA0MDAwIDIxNjAgMjE2MyAyMTY4IDIyMjIgMHg0OCAweGEKW2RybTpkcm1fbW9kZV9k ZWJ1Z19wcmludG1vZGVsaW5lXSBNb2RlbGluZSAxMDM6IjM4NDB4MjE2MCIgNDggNDI2NjAwIDM4 NDAgMzg4OCAzOTIwIDQwMDAgMjE2MCAyMTYzIDIxNjggMjIyMiAweDQwIDB4YQouLi4KW2RybTpp bnRlbF9kdW1wX3BpcGVfY29uZmlnIFtpOTE1XV0gW0NSVEM6NTE6cGlwZSBBXVttb2Rlc2V0XQpb ZHJtOmludGVsX2R1bXBfcGlwZV9jb25maWcgW2k5MTVdXSBvdXRwdXRfdHlwZXM6IEVEUCAoMHgx MDApCltkcm06aW50ZWxfZHVtcF9waXBlX2NvbmZpZyBbaTkxNV1dIGNwdV90cmFuc2NvZGVyOiBF RFAsIHBpcGUgYnBwOiAyNCwgZGl0aGVyaW5nOiAwCltkcm06aW50ZWxfZHVtcF9waXBlX2NvbmZp ZyBbaTkxNV1dIGRwIG1fbjogbGFuZXM6IDQ7IGdtY2hfbTogNDk3MDI1MCwgZ21jaF9uOiA4Mzg4 NjA4LCBsaW5rX206IDgyODM3NSwgbGlua19uOiAxMDQ4NTc2LCB0dTogNjQKW2RybTppbnRlbF9k dW1wX3BpcGVfY29uZmlnIFtpOTE1XV0gZHAgbTJfbjI6IGxhbmVzOiA0OyBnbWNoX206IDQ5NzAy NTAsIGdtY2hfbjogODM4ODYwOCwgbGlua19tOiA4MjgzNzUsIGxpbmtfbjogMTA0ODU3NiwgdHU6 IDY0Cltkcm06aW50ZWxfZHVtcF9waXBlX2NvbmZpZyBbaTkxNV1dIGF1ZGlvOiAwLCBpbmZvZnJh bWVzOiAwCltkcm06aW50ZWxfZHVtcF9waXBlX2NvbmZpZyBbaTkxNV1dIHJlcXVlc3RlZCBtb2Rl OgpbZHJtOmRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmVdIE1vZGVsaW5lIDA6IjM4NDB4MjE2 MCIgNjAgNTMzMjUwIDM4NDAgMzg4OCAzOTIwIDQwMDAgMjE2MCAyMTYzIDIxNjggMjIyMiAweDQ4 IDB4YQpbZHJtOmludGVsX2R1bXBfcGlwZV9jb25maWcgW2k5MTVdXSBhZGp1c3RlZCBtb2RlOgpb ZHJtOmRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmVdIE1vZGVsaW5lIDA6IjM4NDB4MjE2MCIg NDggNDI2NjAwIDM4NDAgMzg4OCAzOTIwIDQwMDAgMjE2MCAyMTYzIDIxNjggMjIyMiAweDQwIDB4 YQoKQWRkIGEgaW50ZWxfZWRwX2Nob29zZV9tb2RlIGhlbHBlciB0aGF0IHBpY2tzIHRoZSBtb2Rl LgoKSWYgdGhlcmUgaXMgbm8gYWx0IG1vZGUsIGl0IGFsd2F5cyBwaWNrcyB0aGUgZGVmYXVsdCBt b2RlLgpJZiB0aGUgYWx0IG1vZGUgaXMgaWRlbnRpY2FsIHRvIHRoZSBkZWZhdWx0IG1vZGUsIGl0 IHBpY2tzIHRoZSBtb2RlCmJhc2VkIG9uIHdoYXQgbW9kZSBpcyBjbG9zZXN0IHRvIHRoZSByZXF1 ZXN0IGNsb2NrLgpJZiB0aGUgYWx0IG1vZGUgZGlmZmVycywgaXQgb25seSBwaWNrcyB0aGUgYWx0 IG1vZGUgb24gZXhhY3QgbWF0Y2guCgpUZXN0Y2FzZToga21zX3BhbmVsX2ZpdHRpbmcuYXRvbWlj LWZhc3RzZXQKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KRml4ZXM6IGRjOTExZjViZDhhYSAoImRybS9pOTE1L2VkcDog QWxsb3cgYWx0ZXJuYXRlIGZpeGVkIG1vZGUgZm9yIGVEUCBpZiBhdmFpbGFibGUuIikKQ2M6IERh dmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KQ2M6IFJvZHJp Z28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8u ci56YW5vbmlAaW50ZWwuY29tPgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNv bT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSmltIEJy aWRlIDxqaW0uYnJpZGVAbGludXguaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29u YXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ ICMgdjQuMTQrCkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDU0NjkKUmVmZXJlbmNlczogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA1NDU2Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YyB8IDM5ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCmluZGV4IDlhNGE1MWU3OWZhMS4uMDc1OTgxODQyYTdmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMKQEAgLTE2NzEsMjEgKzE2NzEsMjUgQEAgc3RhdGljIGludCBpbnRlbF9kcF9jb21w dXRlX2JwcChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCXJldHVybiBicHA7CiB9CiAKLXN0 YXRpYyBib29sIGludGVsX2VkcF9jb21wYXJlX2FsdF9tb2RlKHN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICptMSwKLQkJCQkgICAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm0yKQorc3RhdGlj IGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICoKK2ludGVsX2VkcF9jaG9vc2VfbW9kZShj b25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqcmVxLAorCQkgICAgICBjb25zdCBzdHJ1Y3Qg ZHJtX2Rpc3BsYXlfbW9kZSAqZGVmLAorCQkgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqYWx0KQogewotCWJvb2wgYnJlcyA9IGZhbHNlOworCWlmICghYWx0KQorCQlyZXR1cm4g ZGVmOwogCi0JaWYgKG0xICYmIG0yKQotCQlicmVzID0gKG0xLT5oZGlzcGxheSA9PSBtMi0+aGRp c3BsYXkgJiYKLQkJCW0xLT5oc3luY19zdGFydCA9PSBtMi0+aHN5bmNfc3RhcnQgJiYKLQkJCW0x LT5oc3luY19lbmQgPT0gbTItPmhzeW5jX2VuZCAmJgotCQkJbTEtPmh0b3RhbCA9PSBtMi0+aHRv dGFsICYmCi0JCQltMS0+dmRpc3BsYXkgPT0gbTItPnZkaXNwbGF5ICYmCi0JCQltMS0+dnN5bmNf c3RhcnQgPT0gbTItPnZzeW5jX3N0YXJ0ICYmCi0JCQltMS0+dnN5bmNfZW5kID09IG0yLT52c3lu Y19lbmQgJiYKLQkJCW0xLT52dG90YWwgPT0gbTItPnZ0b3RhbCk7Ci0JcmV0dXJuIGJyZXM7CisJ aWYgKGRybV9tb2RlX2VxdWFsX25vX2Nsb2NrcyhkZWYsIGFsdCkpIHsKKwkJaW50IGNsb2NrOwor CisJCWlmICghZHJtX21vZGVfZXF1YWxfbm9fY2xvY2tzKHJlcSwgZGVmKSkKKwkJCXJldHVybiBk ZWY7CisKKwkJY2xvY2sgPSBkZWYtPmNsb2NrIC8gMiArIGFsdC0+Y2xvY2sgLyAyOworCisJCXJl dHVybiByZXEtPmNsb2NrID4gY2xvY2sgPyBkZWYgOiBhbHQ7CisJfSBlbHNlCisJCXJldHVybiBk cm1fbW9kZV9lcXVhbF9ub19jbG9ja3MocmVxLCBhbHQpID8gYWx0IDogZGVmOwogfQogCiBib29s CkBAIC0xNzM0LDEyICsxNzM4LDExIEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQlwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvID0gaW50ZWxf Y29ubl9zdGF0ZS0+Zm9yY2VfYXVkaW8gPT0gSERNSV9BVURJT19PTjsKIAogCWlmIChpbnRlbF9k cF9pc19lZHAoaW50ZWxfZHApICYmIGludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml4ZWRfbW9kZSkg ewotCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqcGFuZWxfbW9kZSA9Ci0JCQlpbnRlbF9jb25u ZWN0b3ItPnBhbmVsLmFsdF9maXhlZF9tb2RlOwotCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq cmVxX21vZGUgPSAmcGlwZV9jb25maWctPmJhc2UubW9kZTsKKwkJY29uc3Qgc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKnBhbmVsX21vZGU7CiAKLQkJaWYgKCFpbnRlbF9lZHBfY29tcGFyZV9hbHRf bW9kZShyZXFfbW9kZSwgcGFuZWxfbW9kZSkpCi0JCQlwYW5lbF9tb2RlID0gaW50ZWxfY29ubmVj dG9yLT5wYW5lbC5maXhlZF9tb2RlOworCQlwYW5lbF9tb2RlID0gaW50ZWxfZWRwX2Nob29zZV9t b2RlKCZwaXBlX2NvbmZpZy0+YmFzZS5tb2RlLAorCQkJCQkJICAgaW50ZWxfY29ubmVjdG9yLT5w YW5lbC5maXhlZF9tb2RlLAorCQkJCQkJICAgaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5hbHRfZml4 ZWRfbW9kZSk7CiAKIAkJZHJtX21vZGVfZGVidWdfcHJpbnRtb2RlbGluZShwYW5lbF9tb2RlKTsK IAotLSAKMi4xNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK