From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/2] drm/i915/icl: Configure MG DP mode for HDMI ports too Date: Fri, 2 Nov 2018 21:26:56 +0200 Message-ID: <20181102192656.4472-3-imre.deak@intel.com> References: <20181102192656.4472-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 432F86E5CE for ; Fri, 2 Nov 2018 19:27:02 +0000 (UTC) In-Reply-To: <20181102192656.4472-1-imre.deak@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 List-Id: intel-gfx@lists.freedesktop.org VGhlIE1HIERQIG1vZGUgbmVlZHMgdG8gYmUgY29uZmlndXJlZCBmb3IgVHlwZSBDIHN0YXRpYy9m aXhlZC9sZWdhY3kKSERNSSBwb3J0cyB0b28sIHRoZSBzYW1lIHdheSBhcyBpdCdzIGNvbmZpZ3Vy ZWQgZm9yIFR5cGUgQwpzdGF0aWMvZml4ZWQvbGVnYWN5LCBmaXggdGhpcy4KCkJzcGVjOiA0MjMy LCAyMTczNQpDYzogVmFuZGl0YSBLdWxrYXJuaSA8dmFuZGl0YS5rdWxrYXJuaUBpbnRlbC5jb20+ CkNjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYyB8IDY4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgIHwgNjYgLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIHwgIDEgLQogMyBmaWxlcyBjaGFuZ2VkLCA2NyBpbnNlcnRpb25zKCspLCA2OCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCmluZGV4IGNiMDYwNTgxNzlmZC4uYWI5YTM2 YzRiYTNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwpAQCAtMjk4MCw2ICsyOTgwLDcxIEBA IHN0YXRpYyB2b2lkIGljbF9kaXNhYmxlX3BoeV9jbG9ja19nYXRpbmcoc3RydWN0IGludGVsX2Rp Z2l0YWxfcG9ydCAqZGlnX3BvcnQpCiAJSTkxNV9XUklURShNR19NSVNDX1NVUzAodGNfcG9ydCks IHZhbCk7CiB9CiAKK3N0YXRpYyB2b2lkIGljbF9wcm9ncmFtX21nX2RwX21vZGUoc3RydWN0IGlu dGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldik7 CisJZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5wb3J0OworCWVudW0gdGNf cG9ydCB0Y19wb3J0ID0gaW50ZWxfcG9ydF90b190YyhkZXZfcHJpdiwgcG9ydCk7CisJdTMyIGxu MCwgbG4xLCBsYW5lX2luZm87CisKKwlpZiAodGNfcG9ydCA9PSBQT1JUX1RDX05PTkUgfHwgaW50 ZWxfZGlnX3BvcnQtPnRjX3R5cGUgPT0gVENfUE9SVF9UQlQpCisJCXJldHVybjsKKworCWxuMCA9 IEk5MTVfUkVBRChNR19EUF9NT0RFKHBvcnQsIDApKTsKKwlsbjEgPSBJOTE1X1JFQUQoTUdfRFBf TU9ERShwb3J0LCAxKSk7CisKKwlzd2l0Y2ggKGludGVsX2RpZ19wb3J0LT50Y190eXBlKSB7CisJ Y2FzZSBUQ19QT1JUX1RZUEVDOgorCQlsbjAgJj0gfihNR19EUF9NT0RFX0NGR19EUF9YMV9NT0RF IHwgTUdfRFBfTU9ERV9DRkdfRFBfWDJfTU9ERSk7CisJCWxuMSAmPSB+KE1HX0RQX01PREVfQ0ZH X0RQX1gxX01PREUgfCBNR19EUF9NT0RFX0NGR19EUF9YMl9NT0RFKTsKKworCQlsYW5lX2luZm8g PSAoSTkxNV9SRUFEKFBPUlRfVFhfREZMRVhEUFNQKSAmCisJCQkgICAgIERQX0xBTkVfQVNTSUdO TUVOVF9NQVNLKHRjX3BvcnQpKSA+PgorCQkJICAgIERQX0xBTkVfQVNTSUdOTUVOVF9TSElGVCh0 Y19wb3J0KTsKKworCQlzd2l0Y2ggKGxhbmVfaW5mbykgeworCQljYXNlIDB4MToKKwkJY2FzZSAw eDQ6CisJCQlicmVhazsKKwkJY2FzZSAweDI6CisJCQlsbjAgfD0gTUdfRFBfTU9ERV9DRkdfRFBf WDFfTU9ERTsKKwkJCWJyZWFrOworCQljYXNlIDB4MzoKKwkJCWxuMCB8PSBNR19EUF9NT0RFX0NG R19EUF9YMV9NT0RFIHwKKwkJCSAgICAgICBNR19EUF9NT0RFX0NGR19EUF9YMl9NT0RFOworCQkJ YnJlYWs7CisJCWNhc2UgMHg4OgorCQkJbG4xIHw9IE1HX0RQX01PREVfQ0ZHX0RQX1gxX01PREU7 CisJCQlicmVhazsKKwkJY2FzZSAweEM6CisJCQlsbjEgfD0gTUdfRFBfTU9ERV9DRkdfRFBfWDFf TU9ERSB8CisJCQkgICAgICAgTUdfRFBfTU9ERV9DRkdfRFBfWDJfTU9ERTsKKwkJCWJyZWFrOwor CQljYXNlIDB4RjoKKwkJCWxuMCB8PSBNR19EUF9NT0RFX0NGR19EUF9YMV9NT0RFIHwKKwkJCSAg ICAgICBNR19EUF9NT0RFX0NGR19EUF9YMl9NT0RFOworCQkJbG4xIHw9IE1HX0RQX01PREVfQ0ZH X0RQX1gxX01PREUgfAorCQkJICAgICAgIE1HX0RQX01PREVfQ0ZHX0RQX1gyX01PREU7CisJCQli cmVhazsKKwkJZGVmYXVsdDoKKwkJCU1JU1NJTkdfQ0FTRShsYW5lX2luZm8pOworCQl9CisJCWJy ZWFrOworCisJY2FzZSBUQ19QT1JUX0xFR0FDWToKKwkJbG4wIHw9IE1HX0RQX01PREVfQ0ZHX0RQ X1gxX01PREUgfCBNR19EUF9NT0RFX0NGR19EUF9YMl9NT0RFOworCQlsbjEgfD0gTUdfRFBfTU9E RV9DRkdfRFBfWDFfTU9ERSB8IE1HX0RQX01PREVfQ0ZHX0RQX1gyX01PREU7CisJCWJyZWFrOwor CisJZGVmYXVsdDoKKwkJTUlTU0lOR19DQVNFKGludGVsX2RpZ19wb3J0LT50Y190eXBlKTsKKwkJ cmV0dXJuOworCX0KKworCUk5MTVfV1JJVEUoTUdfRFBfTU9ERShwb3J0LCAwKSwgbG4wKTsKKwlJ OTE1X1dSSVRFKE1HX0RQX01PREUocG9ydCwgMSksIGxuMSk7Cit9CisKIHN0YXRpYyB2b2lkIGlu dGVsX2RkaV9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJ CSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgICAg Y29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCkBAIC0zMDAyLDcg KzMwNjcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJsZV9kcChzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2 LCBkaWdfcG9ydC0+ZGRpX2lvX3Bvd2VyX2RvbWFpbik7CiAKLQlpY2xfcHJvZ3JhbV9tZ19kcF9t b2RlKGludGVsX2RwKTsKKwlpY2xfcHJvZ3JhbV9tZ19kcF9tb2RlKGRpZ19wb3J0KTsKIAlpY2xf ZGlzYWJsZV9waHlfY2xvY2tfZ2F0aW5nKGRpZ19wb3J0KTsKIAogCWlmIChJU19JQ0VMQUtFKGRl dl9wcml2KSkKQEAgLTMwNDQsNiArMzEwOSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVf ZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlpbnRlbF9kaXNw bGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgZGlnX3BvcnQtPmRkaV9pb19wb3dlcl9kb21haW4pOwog CisJaWNsX3Byb2dyYW1fbWdfZHBfbW9kZShkaWdfcG9ydCk7CiAJaWNsX2Rpc2FibGVfcGh5X2Ns b2NrX2dhdGluZyhkaWdfcG9ydCk7CiAKIAlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYwppbmRleCAxMjdmYzgyOTAyYzYuLmI2NjdmYTg1ZjYwOSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0yNDEsNzIgKzI0MSw2IEBAIGludGVsX2RwX2xpbmtfcmVx dWlyZWQoaW50IHBpeGVsX2Nsb2NrLCBpbnQgYnBwKQogCXJldHVybiBESVZfUk9VTkRfVVAocGl4 ZWxfY2xvY2sgKiBicHAsIDgpOwogfQogCi12b2lkIGljbF9wcm9ncmFtX21nX2RwX21vZGUoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCkKLXsKLQlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpp bnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkcF90b19pOTE1KGludGVsX2RwKTsKLQllbnVtIHBvcnQg cG9ydCA9IGludGVsX2RpZ19wb3J0LT5iYXNlLnBvcnQ7Ci0JZW51bSB0Y19wb3J0IHRjX3BvcnQg PSBpbnRlbF9wb3J0X3RvX3RjKGRldl9wcml2LCBwb3J0KTsKLQl1MzIgbG4wLCBsbjEsIGxhbmVf aW5mbzsKLQotCWlmICh0Y19wb3J0ID09IFBPUlRfVENfTk9ORSB8fCBpbnRlbF9kaWdfcG9ydC0+ dGNfdHlwZSA9PSBUQ19QT1JUX1RCVCkKLQkJcmV0dXJuOwotCi0JbG4wID0gSTkxNV9SRUFEKE1H X0RQX01PREUocG9ydCwgMCkpOwotCWxuMSA9IEk5MTVfUkVBRChNR19EUF9NT0RFKHBvcnQsIDEp KTsKLQotCXN3aXRjaCAoaW50ZWxfZGlnX3BvcnQtPnRjX3R5cGUpIHsKLQljYXNlIFRDX1BPUlRf VFlQRUM6Ci0JCWxuMCAmPSB+KE1HX0RQX01PREVfQ0ZHX0RQX1gxX01PREUgfCBNR19EUF9NT0RF X0NGR19EUF9YMl9NT0RFKTsKLQkJbG4xICY9IH4oTUdfRFBfTU9ERV9DRkdfRFBfWDFfTU9ERSB8 IE1HX0RQX01PREVfQ0ZHX0RQX1gyX01PREUpOwotCi0JCWxhbmVfaW5mbyA9IChJOTE1X1JFQUQo UE9SVF9UWF9ERkxFWERQU1ApICYKLQkJCSAgICAgRFBfTEFORV9BU1NJR05NRU5UX01BU0sodGNf cG9ydCkpID4+Ci0JCQkgICAgRFBfTEFORV9BU1NJR05NRU5UX1NISUZUKHRjX3BvcnQpOwotCi0J CXN3aXRjaCAobGFuZV9pbmZvKSB7Ci0JCWNhc2UgMHgxOgotCQljYXNlIDB4NDoKLQkJCWJyZWFr OwotCQljYXNlIDB4MjoKLQkJCWxuMCB8PSBNR19EUF9NT0RFX0NGR19EUF9YMV9NT0RFOwotCQkJ YnJlYWs7Ci0JCWNhc2UgMHgzOgotCQkJbG4wIHw9IE1HX0RQX01PREVfQ0ZHX0RQX1gxX01PREUg fAotCQkJICAgICAgIE1HX0RQX01PREVfQ0ZHX0RQX1gyX01PREU7Ci0JCQlicmVhazsKLQkJY2Fz ZSAweDg6Ci0JCQlsbjEgfD0gTUdfRFBfTU9ERV9DRkdfRFBfWDFfTU9ERTsKLQkJCWJyZWFrOwot CQljYXNlIDB4QzoKLQkJCWxuMSB8PSBNR19EUF9NT0RFX0NGR19EUF9YMV9NT0RFIHwKLQkJCSAg ICAgICBNR19EUF9NT0RFX0NGR19EUF9YMl9NT0RFOwotCQkJYnJlYWs7Ci0JCWNhc2UgMHhGOgot CQkJbG4wIHw9IE1HX0RQX01PREVfQ0ZHX0RQX1gxX01PREUgfAotCQkJICAgICAgIE1HX0RQX01P REVfQ0ZHX0RQX1gyX01PREU7Ci0JCQlsbjEgfD0gTUdfRFBfTU9ERV9DRkdfRFBfWDFfTU9ERSB8 Ci0JCQkgICAgICAgTUdfRFBfTU9ERV9DRkdfRFBfWDJfTU9ERTsKLQkJCWJyZWFrOwotCQlkZWZh dWx0OgotCQkJTUlTU0lOR19DQVNFKGxhbmVfaW5mbyk7Ci0JCX0KLQkJYnJlYWs7Ci0KLQljYXNl IFRDX1BPUlRfTEVHQUNZOgotCQlsbjAgfD0gTUdfRFBfTU9ERV9DRkdfRFBfWDFfTU9ERSB8IE1H X0RQX01PREVfQ0ZHX0RQX1gyX01PREU7Ci0JCWxuMSB8PSBNR19EUF9NT0RFX0NGR19EUF9YMV9N T0RFIHwgTUdfRFBfTU9ERV9DRkdfRFBfWDJfTU9ERTsKLQkJYnJlYWs7Ci0KLQlkZWZhdWx0Ogot CQlNSVNTSU5HX0NBU0UoaW50ZWxfZGlnX3BvcnQtPnRjX3R5cGUpOwotCQlyZXR1cm47Ci0JfQot Ci0JSTkxNV9XUklURShNR19EUF9NT0RFKHBvcnQsIDApLCBsbjApOwotCUk5MTVfV1JJVEUoTUdf RFBfTU9ERShwb3J0LCAxKSwgbG4xKTsKLX0KLQogaW50CiBpbnRlbF9kcF9tYXhfZGF0YV9yYXRl KGludCBtYXhfbGlua19jbG9jaywgaW50IG1heF9sYW5lcykKIHsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKaW5kZXggZDBiZTU5NTk5ZTIzLi5hMGY5MGQ2ODRhNmIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCkBAIC0xODE5LDcgKzE4MTksNiBAQCB2b2lkIGludGVsX2VkcF9kcnJzX2ludmFs aWRhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIHVuc2ln bmVkIGludCBmcm9udGJ1ZmZlcl9iaXRzKTsKIHZvaWQgaW50ZWxfZWRwX2RycnNfZmx1c2goc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICB1bnNpZ25lZCBpbnQgZnJvbnRi dWZmZXJfYml0cyk7Ci12b2lkIGljbF9wcm9ncmFtX21nX2RwX21vZGUoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCk7CiAKIHZvaWQKIGludGVsX2RwX3Byb2dyYW1fbGlua190cmFpbmluZ19wYXR0 ZXJuKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCi0tIAoyLjEzLjIKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=