From: Ville Syrjala Subject: [PATCH v2 9/9] drm/i915: Split intel_enable_ddi() into DP and HDMI variants Date: Tue, 10 Oct 2017 15:12:07 +0300 Message-ID: <20171010121207.570-10-ville.syrjala@linux.intel.com> References: <20171010121207.570-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D15C6E454 for ; Tue, 10 Oct 2017 12:12:37 +0000 (UTC) In-Reply-To: <20171010121207.570-1-ville.syrjala@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVu dGFuZ2xlIGludGVsX2VuYWJsZV9kZGkoKSBieSBzcGxpdHRpbmcgaXQgaW50byBEUCBhbmQgSERN SSBzcGVjaWZpYwp2YXJpYW50cy4KCnYyOiBLZWVwIHVzaW5nIGludGVsX2RkaV9nZXRfZW5jb2Rl cl9wb3J0KCkgZm9yIG5vdwoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k ZGkuYyB8IDg2ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RkaS5jCmluZGV4IDQ5Y2Y4ZDlkMmJjMS4uMThiZjA2YzdlNDNmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwpAQCAtMjM2OSw0NSArMjM2OSw1NyBAQCB2b2lkIGludGVsX2RkaV9m ZGlfcG9zdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCUk5MTVfV1JJ VEUoRkRJX1JYX0NUTChQSVBFX0EpLCB2YWwpOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9lbmFi bGVfZGRpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAotCQkJICAgICBjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCitzdGF0aWMgdm9pZCBpbnRl bF9lbmFibGVfZGRpX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJCWNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJCWNvbnN0IHN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCWVudW0g cG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5jb2Rlcik7CisKKwlpZiAo cG9ydCA9PSBQT1JUX0EgJiYgSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCisJCWludGVsX2RwX3N0 b3BfbGlua190cmFpbihpbnRlbF9kcCk7CisKKwlpbnRlbF9lZHBfYmFja2xpZ2h0X29uKGNydGNf c3RhdGUsIGNvbm5fc3RhdGUpOworCWludGVsX3Bzcl9lbmFibGUoaW50ZWxfZHAsIGNydGNfc3Rh dGUpOworCWludGVsX2VkcF9kcnJzX2VuYWJsZShpbnRlbF9kcCwgY3J0Y19zdGF0ZSk7CisKKwlp ZiAoY3J0Y19zdGF0ZS0+aGFzX2F1ZGlvKQorCQlpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoZW5j b2RlciwgY3J0Y19zdGF0ZSwgY29ubl9zdGF0ZSk7Cit9CisKK3N0YXRpYyB2b2lkIGludGVsX2Vu YWJsZV9kZGlfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJCQkgIGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJCSAgY29uc3Qgc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CisJc3RydWN0IGlu dGVsX2RpZ2l0YWxfcG9ydCAqZGlnX3BvcnQgPSBlbmNfdG9fZGlnX3BvcnQoJmVuY29kZXItPmJh c2UpOworCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5jb2Rl cik7CisKKwlpbnRlbF9oZG1pX2hhbmRsZV9zaW5rX3NjcmFtYmxpbmcoZW5jb2RlciwKKwkJCQkJ ICBjb25uX3N0YXRlLT5jb25uZWN0b3IsCisJCQkJCSAgY3J0Y19zdGF0ZS0+aGRtaV9oaWdoX3Rt ZHNfY2xvY2tfcmF0aW8sCisJCQkJCSAgY3J0Y19zdGF0ZS0+aGRtaV9zY3JhbWJsaW5nKTsKKwor CS8qIEluIEhETUkvRFZJIG1vZGUsIHRoZSBwb3J0IHdpZHRoLCBhbmQgc3dpbmcvZW1waGFzaXMg dmFsdWVzCisJICogYXJlIGlnbm9yZWQgc28gbm90aGluZyBzcGVjaWFsIG5lZWRzIHRvIGJlIGRv bmUgYmVzaWRlcworCSAqIGVuYWJsaW5nIHRoZSBwb3J0LgorCSAqLworCUk5MTVfV1JJVEUoRERJ X0JVRl9DVEwocG9ydCksCisJCSAgIGRpZ19wb3J0LT5zYXZlZF9wb3J0X2JpdHMgfCBERElfQlVG X0NUTF9FTkFCTEUpOworCisJaWYgKGNydGNfc3RhdGUtPmhhc19hdWRpbykKKwkJaW50ZWxfYXVk aW9fY29kZWNfZW5hYmxlKGVuY29kZXIsIGNydGNfc3RhdGUsIGNvbm5fc3RhdGUpOworfQorCitz dGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfZGRpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LAorCQkJICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJ CSAgICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7Ci0J c3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmludGVsX2VuY29kZXItPmJhc2U7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5kZXYpOwot CWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoaW50ZWxfZW5jb2Rl cik7Ci0JaW50IHR5cGUgPSBpbnRlbF9lbmNvZGVyLT50eXBlOwotCi0JaWYgKHR5cGUgPT0gSU5U RUxfT1VUUFVUX0hETUkpIHsKLQkJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGln X3BvcnQgPQotCQkJZW5jX3RvX2RpZ19wb3J0KGVuY29kZXIpOwotCQlib29sIGNsb2NrX3JhdGlv ID0gcGlwZV9jb25maWctPmhkbWlfaGlnaF90bWRzX2Nsb2NrX3JhdGlvOwotCQlib29sIHNjcmFt YmxpbmcgPSBwaXBlX2NvbmZpZy0+aGRtaV9zY3JhbWJsaW5nOwotCi0JCWludGVsX2hkbWlfaGFu ZGxlX3Npbmtfc2NyYW1ibGluZyhpbnRlbF9lbmNvZGVyLAotCQkJCQkJICBjb25uX3N0YXRlLT5j b25uZWN0b3IsCi0JCQkJCQkgIGNsb2NrX3JhdGlvLCBzY3JhbWJsaW5nKTsKLQotCQkvKiBJbiBI RE1JL0RWSSBtb2RlLCB0aGUgcG9ydCB3aWR0aCwgYW5kIHN3aW5nL2VtcGhhc2lzIHZhbHVlcwot CQkgKiBhcmUgaWdub3JlZCBzbyBub3RoaW5nIHNwZWNpYWwgbmVlZHMgdG8gYmUgZG9uZSBiZXNp ZGVzCi0JCSAqIGVuYWJsaW5nIHRoZSBwb3J0LgotCQkgKi8KLQkJSTkxNV9XUklURShERElfQlVG X0NUTChwb3J0KSwKLQkJCSAgIGludGVsX2RpZ19wb3J0LT5zYXZlZF9wb3J0X2JpdHMgfAotCQkJ ICAgRERJX0JVRl9DVExfRU5BQkxFKTsKLQl9IGVsc2UgaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVU X0VEUCkgewotCQlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKGVu Y29kZXIpOwotCi0JCWlmIChwb3J0ID09IFBPUlRfQSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwg OSkKLQkJCWludGVsX2RwX3N0b3BfbGlua190cmFpbihpbnRlbF9kcCk7Ci0KLQkJaW50ZWxfZWRw X2JhY2tsaWdodF9vbihwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7Ci0JCWludGVsX3Bzcl9lbmFi bGUoaW50ZWxfZHAsIHBpcGVfY29uZmlnKTsKLQkJaW50ZWxfZWRwX2RycnNfZW5hYmxlKGludGVs X2RwLCBwaXBlX2NvbmZpZyk7Ci0JfQotCi0JaWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8pCi0J CWludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShpbnRlbF9lbmNvZGVyLCBwaXBlX2NvbmZpZywgY29u bl9zdGF0ZSk7CisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VU UFVUX0hETUkpKQorCQlpbnRlbF9lbmFibGVfZGRpX2hkbWkoZW5jb2RlciwgY3J0Y19zdGF0ZSwg Y29ubl9zdGF0ZSk7CisJZWxzZQorCQlpbnRlbF9lbmFibGVfZGRpX2RwKGVuY29kZXIsIGNydGNf c3RhdGUsIGNvbm5fc3RhdGUpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX2RkaV9k cChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKLS0gCjIuMTMuNgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==