From: Ville Syrjala Subject: [PATCH v2 5/9] drm/i915: Split intel_ddi_post_disable() into DP vs. HDMI variants Date: Tue, 10 Oct 2017 15:12:03 +0300 Message-ID: <20171010121207.570-6-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id A8DE289CE1 for ; Tue, 10 Oct 2017 12:12:25 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRv IGNsZWFuIHVwIHRoZSBtZXNzIGluIGludGVsX2RkaV9wb3N0X2Rpc2FibGUoKSBzcGxpdCBpdCBp bnRvIHR3bwpjbGVhbiB2YXJpYW50cyBmb3IgSERNSSBhbmQgRFAuCgp2MjogUmViYXNlIGR1ZSB0 byBNU1QgRFBNUyBjaGFuZ2VzCgpSZXZpZXdlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxh QGludGVsLmNvbT4gI3YxClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRp LmMgfCAxMTEgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kZGkuYwppbmRleCA3MTg3YWVhNzU2OTcuLmFmZTU2YmM2ZmNlMyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGRpLmMKQEAgLTIyODAsNTYgKzIyODAsNzMgQEAgc3RhdGljIHZvaWQgaW50ZWxf ZGlzYWJsZV9kZGlfYnVmKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCQlpbnRlbF93 YWl0X2RkaV9idWZfaWRsZShkZXZfcHJpdiwgcG9ydCk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVs X2RkaV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCitz dGF0aWMgdm9pZCBpbnRlbF9kZGlfcG9zdF9kaXNhYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAorCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRf Y3J0Y19zdGF0ZSwKKwkJCQkgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq b2xkX2Nvbm5fc3RhdGUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CisJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAq ZGlnX3BvcnQgPSBlbmNfdG9fZGlnX3BvcnQoJmVuY29kZXItPmJhc2UpOworCXN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAgPSAmZGlnX3BvcnQtPmRwOworCS8qCisJICogb2xkX2NydGNfc3RhdGUg YW5kIG9sZF9jb25uX3N0YXRlIGFyZSBOVUxMIHdoZW4gY2FsbGVkIGZyb20KKwkgKiBEUF9NU1Qu IFRoZSBtYWluIGNvbm5lY3RvciBhc3NvY2lhdGVkIHdpdGggdGhpcyBwb3J0IGlzIG5ldmVyCisJ ICogYm91bmQgdG8gYSBjcnRjIGZvciBNU1QuCisJICovCisJYm9vbCBpc19tc3QgPSAhb2xkX2Ny dGNfc3RhdGU7CisKKwkvKgorCSAqIFBvd2VyIGRvd24gc2luayBiZWZvcmUgZGlzYWJsaW5nIHRo ZSBwb3J0LCBvdGhlcndpc2Ugd2UgZW5kCisJICogdXAgZ2V0dGluZyBpbnRlcnJ1cHRzIGZyb20g dGhlIHNpbmsgb24gZGV0ZWN0aW5nIGxpbmsgbG9zcy4KKwkgKi8KKwlpZiAoIWlzX21zdCkKKwkJ aW50ZWxfZHBfc2lua19kcG1zKGludGVsX2RwLCBEUk1fTU9ERV9EUE1TX09GRik7CisKKwlpbnRl bF9kaXNhYmxlX2RkaV9idWYoZW5jb2Rlcik7CisKKwlpbnRlbF9lZHBfcGFuZWxfdmRkX29uKGlu dGVsX2RwKTsKKwlpbnRlbF9lZHBfcGFuZWxfb2ZmKGludGVsX2RwKTsKKworCWludGVsX2Rpc3Bs YXlfcG93ZXJfcHV0KGRldl9wcml2LCBkaWdfcG9ydC0+ZGRpX2lvX3Bvd2VyX2RvbWFpbik7CisK KwlpbnRlbF9kZGlfY2xrX2Rpc2FibGUoZW5jb2Rlcik7Cit9CisKK3N0YXRpYyB2b2lkIGludGVs X2RkaV9wb3N0X2Rpc2FibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJ CQkJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJCQlj b25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUpCit7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRl dik7CisJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqZGlnX3BvcnQgPSBlbmNfdG9fZGlnX3Bv cnQoJmVuY29kZXItPmJhc2UpOworCXN0cnVjdCBpbnRlbF9oZG1pICppbnRlbF9oZG1pID0gJmRp Z19wb3J0LT5oZG1pOworCisJaW50ZWxfZGlzYWJsZV9kZGlfYnVmKGVuY29kZXIpOworCisJZGln X3BvcnQtPnNldF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLCBmYWxzZSwKKwkJCQkgb2xkX2Ny dGNfc3RhdGUsIG9sZF9jb25uX3N0YXRlKTsKKworCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRl dl9wcml2LCBkaWdfcG9ydC0+ZGRpX2lvX3Bvd2VyX2RvbWFpbik7CisKKwlpbnRlbF9kZGlfY2xr X2Rpc2FibGUoZW5jb2Rlcik7CisKKwlpbnRlbF9kcF9kdWFsX21vZGVfc2V0X3RtZHNfb3V0cHV0 KGludGVsX2hkbWksIGZhbHNlKTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfZGRpX3Bvc3RfZGlz YWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCQkJICAgY29uc3Qgc3RydWN0IGRy bV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlKQogewotCXN0cnVjdCBkcm1fZW5jb2Rl ciAqZW5jb2RlciA9ICZpbnRlbF9lbmNvZGVyLT5iYXNlOwotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+ZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZGln aXRhbF9wb3J0ICpkaWdfcG9ydCA9IGVuY190b19kaWdfcG9ydChlbmNvZGVyKTsKLQlpbnQgdHlw ZSA9IGludGVsX2VuY29kZXItPnR5cGU7Ci0KLQlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRFAg fHwgdHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7Ci0JCS8qCi0JCSAqIG9sZF9jcnRjX3N0YXRl IGFuZCBvbGRfY29ubl9zdGF0ZSBhcmUgTlVMTCB3aGVuIGNhbGxlZCBmcm9tCi0JCSAqIERQX01T VC4gVGhlIG1haW4gY29ubmVjdG9yIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHBvcnQgaXMgbmV2ZXIK LQkJICogYm91bmQgdG8gYSBjcnRjIGZvciBNU1QuCi0JCSAqLwotCQlib29sIGlzX21zdCA9ICFv bGRfY3J0Y19zdGF0ZTsKLQkJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRl bF9kcChlbmNvZGVyKTsKLQotCQkvKgotCQkgKiBQb3dlciBkb3duIHNpbmsgYmVmb3JlIGRpc2Fi bGluZyB0aGUgcG9ydCwgb3RoZXJ3aXNlIHdlIGVuZAotCQkgKiB1cCBnZXR0aW5nIGludGVycnVw dHMgZnJvbSB0aGUgc2luayBvbiBkZXRlY3RpbmcgbGluayBsb3NzLgotCQkgKi8KLQkJaWYgKCFp c19tc3QpCi0JCQlpbnRlbF9kcF9zaW5rX2RwbXMoaW50ZWxfZHAsIERSTV9NT0RFX0RQTVNfT0ZG KTsKLQl9Ci0KLQlpbnRlbF9kaXNhYmxlX2RkaV9idWYoaW50ZWxfZW5jb2Rlcik7Ci0KLQlpZiAo dHlwZSA9PSBJTlRFTF9PVVRQVVRfSERNSSkgewotCQlkaWdfcG9ydC0+c2V0X2luZm9mcmFtZXMo ZW5jb2RlciwgZmFsc2UsCi0JCQkJCSBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUpOwot CX0KLQotCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9EUCB8fCB0eXBlID09IElOVEVMX09VVFBV VF9FRFApIHsKLQkJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcChl bmNvZGVyKTsKLQotCQlpbnRlbF9lZHBfcGFuZWxfdmRkX29uKGludGVsX2RwKTsKLQkJaW50ZWxf ZWRwX3BhbmVsX29mZihpbnRlbF9kcCk7Ci0JfQotCi0JaWYgKGRpZ19wb3J0KQotCQlpbnRlbF9k aXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgZGlnX3BvcnQtPmRkaV9pb19wb3dlcl9kb21haW4p OwotCi0JaW50ZWxfZGRpX2Nsa19kaXNhYmxlKGludGVsX2VuY29kZXIpOwotCi0JaWYgKHR5cGUg PT0gSU5URUxfT1VUUFVUX0hETUkpIHsKLQkJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkg PSBlbmNfdG9faW50ZWxfaGRtaShlbmNvZGVyKTsKLQotCQlpbnRlbF9kcF9kdWFsX21vZGVfc2V0 X3RtZHNfb3V0cHV0KGludGVsX2hkbWksIGZhbHNlKTsKLQl9CisJLyoKKwkgKiBvbGRfY3J0Y19z dGF0ZSBhbmQgb2xkX2Nvbm5fc3RhdGUgYXJlIE5VTEwgd2hlbiBjYWxsZWQgZnJvbQorCSAqIERQ X01TVC4gVGhlIG1haW4gY29ubmVjdG9yIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHBvcnQgaXMgbmV2 ZXIKKwkgKiBib3VuZCB0byBhIGNydGMgZm9yIE1TVC4KKwkgKi8KKwlpZiAob2xkX2NydGNfc3Rh dGUgJiYKKwkgICAgaW50ZWxfY3J0Y19oYXNfdHlwZShvbGRfY3J0Y19zdGF0ZSwgSU5URUxfT1VU UFVUX0hETUkpKQorCQlpbnRlbF9kZGlfcG9zdF9kaXNhYmxlX2hkbWkoZW5jb2RlciwKKwkJCQkJ ICAgIG9sZF9jcnRjX3N0YXRlLCBvbGRfY29ubl9zdGF0ZSk7CisJZWxzZQorCQlpbnRlbF9kZGlf cG9zdF9kaXNhYmxlX2RwKGVuY29kZXIsCisJCQkJCSAgb2xkX2NydGNfc3RhdGUsIG9sZF9jb25u X3N0YXRlKTsKIH0KIAogdm9pZCBpbnRlbF9kZGlfZmRpX3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKLS0gCjIuMTMuNgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==