From: Ville Syrjala Subject: [PATCH 12/29] drm/i915: Split intel_enable_ddi() into DP and HDMI variants Date: Mon, 18 Sep 2017 21:25:47 +0300 Message-ID: <20170918182604.9519-13-ville.syrjala@linux.intel.com> References: <20170918182604.9519-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A87D46E3CE for ; Mon, 18 Sep 2017 18:26:45 +0000 (UTC) In-Reply-To: <20170918182604.9519-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 SSBzcGVjaWZpYwp2YXJpYW50cy4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGRpLmMgfCA4MCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwppbmRleCBhNjZlMmI2ZDY0Y2IuLjMzNDc4OWMyNGYzMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTIzMzUsNDUgKzIzMzUsNTcgQEAgdm9pZCBpbnRlbF9k ZGlfZmRpX3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlJOTE1 X1dSSVRFKEZESV9SWF9DVEwoUElQRV9BKSwgdmFsKTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxf ZW5hYmxlX2RkaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKLQkJCSAgICAg Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAotCQkJICAgICBjb25z dCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKK3N0YXRpYyB2b2lkIGlu dGVsX2VuYWJsZV9kZGlfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkJY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkJY29uc3Qgc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9lbmNvZGVy ICplbmNvZGVyID0gJmludGVsX2VuY29kZXItPmJhc2U7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5kZXYpOwotCWVudW0gcG9ydCBwb3J0ID0g aW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoaW50ZWxfZW5jb2Rlcik7Ci0JaW50IHR5cGUgPSBp bnRlbF9lbmNvZGVyLT50eXBlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAg PSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCWVudW0gcG9ydCBwb3J0ID0gZW5j b2Rlci0+cG9ydDsKIAotCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKSB7Ci0JCXN0cnVj dCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0KLQkJCWVuY190b19kaWdfcG9y dChlbmNvZGVyKTsKLQkJYm9vbCBjbG9ja19yYXRpbyA9IHBpcGVfY29uZmlnLT5oZG1pX2hpZ2hf dG1kc19jbG9ja19yYXRpbzsKLQkJYm9vbCBzY3JhbWJsaW5nID0gcGlwZV9jb25maWctPmhkbWlf c2NyYW1ibGluZzsKLQotCQlpbnRlbF9oZG1pX2hhbmRsZV9zaW5rX3NjcmFtYmxpbmcoaW50ZWxf ZW5jb2RlciwKLQkJCQkJCSAgY29ubl9zdGF0ZS0+Y29ubmVjdG9yLAotCQkJCQkJICBjbG9ja19y YXRpbywgc2NyYW1ibGluZyk7Ci0KLQkJLyogSW4gSERNSS9EVkkgbW9kZSwgdGhlIHBvcnQgd2lk dGgsIGFuZCBzd2luZy9lbXBoYXNpcyB2YWx1ZXMKLQkJICogYXJlIGlnbm9yZWQgc28gbm90aGlu ZyBzcGVjaWFsIG5lZWRzIHRvIGJlIGRvbmUgYmVzaWRlcwotCQkgKiBlbmFibGluZyB0aGUgcG9y dC4KLQkJICovCi0JCUk5MTVfV1JJVEUoRERJX0JVRl9DVEwocG9ydCksCi0JCQkgICBpbnRlbF9k aWdfcG9ydC0+c2F2ZWRfcG9ydF9iaXRzIHwKLQkJCSAgIERESV9CVUZfQ1RMX0VOQUJMRSk7Ci0J fSBlbHNlIGlmICh0eXBlID09IElOVEVMX09VVFBVVF9FRFApIHsKLQkJc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcChlbmNvZGVyKTsKKwlpZiAocG9ydCA9PSBQT1JU X0EgJiYgSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCisJCWludGVsX2RwX3N0b3BfbGlua190cmFp bihpbnRlbF9kcCk7CiAKLQkJaWYgKHBvcnQgPT0gUE9SVF9BICYmIElOVEVMX0dFTihkZXZfcHJp dikgPCA5KQotCQkJaW50ZWxfZHBfc3RvcF9saW5rX3RyYWluKGludGVsX2RwKTsKKwlpbnRlbF9l ZHBfYmFja2xpZ2h0X29uKGNydGNfc3RhdGUsIGNvbm5fc3RhdGUpOworCWludGVsX3Bzcl9lbmFi bGUoaW50ZWxfZHAsIGNydGNfc3RhdGUpOworCWludGVsX2VkcF9kcnJzX2VuYWJsZShpbnRlbF9k cCwgY3J0Y19zdGF0ZSk7CiAKLQkJaW50ZWxfZWRwX2JhY2tsaWdodF9vbihwaXBlX2NvbmZpZywg Y29ubl9zdGF0ZSk7Ci0JCWludGVsX3Bzcl9lbmFibGUoaW50ZWxfZHAsIHBpcGVfY29uZmlnKTsK LQkJaW50ZWxfZWRwX2RycnNfZW5hYmxlKGludGVsX2RwLCBwaXBlX2NvbmZpZyk7Ci0JfQorCWlm IChjcnRjX3N0YXRlLT5oYXNfYXVkaW8pCisJCWludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShlbmNv ZGVyLCBjcnRjX3N0YXRlLCBjb25uX3N0YXRlKTsKK30KIAotCWlmIChwaXBlX2NvbmZpZy0+aGFz X2F1ZGlvKQotCQlpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoaW50ZWxfZW5jb2RlciwgcGlwZV9j b25maWcsIGNvbm5fc3RhdGUpOworc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2RkaV9oZG1pKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJCSAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkJICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9z dGF0ZSAqY29ubl9zdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0 ICpkaWdfcG9ydCA9IGVuY190b19kaWdfcG9ydCgmZW5jb2Rlci0+YmFzZSk7CisJZW51bSBwb3J0 IHBvcnQgPSBlbmNvZGVyLT5wb3J0OworCisJaW50ZWxfaGRtaV9oYW5kbGVfc2lua19zY3JhbWJs aW5nKGVuY29kZXIsCisJCQkJCSAgY29ubl9zdGF0ZS0+Y29ubmVjdG9yLAorCQkJCQkgIGNydGNf c3RhdGUtPmhkbWlfaGlnaF90bWRzX2Nsb2NrX3JhdGlvLAorCQkJCQkgIGNydGNfc3RhdGUtPmhk bWlfc2NyYW1ibGluZyk7CisKKwkvKiBJbiBIRE1JL0RWSSBtb2RlLCB0aGUgcG9ydCB3aWR0aCwg YW5kIHN3aW5nL2VtcGhhc2lzIHZhbHVlcworCSAqIGFyZSBpZ25vcmVkIHNvIG5vdGhpbmcgc3Bl Y2lhbCBuZWVkcyB0byBiZSBkb25lIGJlc2lkZXMKKwkgKiBlbmFibGluZyB0aGUgcG9ydC4KKwkg Ki8KKwlJOTE1X1dSSVRFKERESV9CVUZfQ1RMKHBvcnQpLAorCQkgICBkaWdfcG9ydC0+c2F2ZWRf cG9ydF9iaXRzIHwgRERJX0JVRl9DVExfRU5BQkxFKTsKKworCWlmIChjcnRjX3N0YXRlLT5oYXNf YXVkaW8pCisJCWludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShlbmNvZGVyLCBjcnRjX3N0YXRlLCBj b25uX3N0YXRlKTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2RkaShzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJCSAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCisJCQkgICAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICpjb25uX3N0YXRlKQoreworCWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGNydGNfc3RhdGUsIElO VEVMX09VVFBVVF9IRE1JKSkKKwkJaW50ZWxfZW5hYmxlX2RkaV9oZG1pKGVuY29kZXIsIGNydGNf c3RhdGUsIGNvbm5fc3RhdGUpOworCWVsc2UKKwkJaW50ZWxfZW5hYmxlX2RkaV9kcChlbmNvZGVy LCBjcnRjX3N0YXRlLCBjb25uX3N0YXRlKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJs ZV9kZGlfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCi0tIAoyLjEzLjUKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=