From: Ville Syrjala Subject: [PATCH 10/29] drm/i915: Split intel_disable_ddi() into DP vs. HDMI variants Date: Mon, 18 Sep 2017 21:25:45 +0300 Message-ID: <20170918182604.9519-11-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 9153B6E3EF for ; Mon, 18 Sep 2017 18:26:39 +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 dGFuZ2xlIGludGVsX2Rpc2FibGVfZGRpKCkgYnkgc3BsaXR0aW5nIGl0IGludG8gRFAgYW5kIEhE TUkgc3BlY2lmaWMKdmFyaWFudHMuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZp bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jIHwgNDUgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggYTNlNTc5ZWU5OTYyLi5iOTJkMjE2N2I1NzYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC0yMzkwLDI5ICsyMzkwLDQwIEBAIHN0YXRpYyB2b2lk IGludGVsX2VuYWJsZV9kZGkoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJ CWludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShpbnRlbF9lbmNvZGVyLCBwaXBlX2NvbmZpZywgY29u bl9zdGF0ZSk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2Rpc2FibGVfZGRpKHN0cnVjdCBpbnRl bF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAotCQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAotCQkJICAgICAgY29uc3Qgc3RydWN0IGRybV9jb25u ZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlKQorc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9k ZGlfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkJIGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJCQkgY29uc3Qgc3RydWN0IGRybV9j b25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlKQogewotCXN0cnVjdCBkcm1fZW5jb2RlciAq ZW5jb2RlciA9ICZpbnRlbF9lbmNvZGVyLT5iYXNlOwotCWludCB0eXBlID0gaW50ZWxfZW5jb2Rl ci0+dHlwZTsKKwlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZl bmNvZGVyLT5iYXNlKTsKIAogCWlmIChvbGRfY3J0Y19zdGF0ZS0+aGFzX2F1ZGlvKQotCQlpbnRl bF9hdWRpb19jb2RlY19kaXNhYmxlKGludGVsX2VuY29kZXIpOworCQlpbnRlbF9hdWRpb19jb2Rl Y19kaXNhYmxlKGVuY29kZXIpOwogCi0JaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpIHsK LQkJaW50ZWxfaGRtaV9oYW5kbGVfc2lua19zY3JhbWJsaW5nKGludGVsX2VuY29kZXIsCi0JCQkJ CQkgIG9sZF9jb25uX3N0YXRlLT5jb25uZWN0b3IsCi0JCQkJCQkgIGZhbHNlLCBmYWxzZSk7Ci0J fQorCWludGVsX2VkcF9kcnJzX2Rpc2FibGUoaW50ZWxfZHAsIG9sZF9jcnRjX3N0YXRlKTsKKwlp bnRlbF9wc3JfZGlzYWJsZShpbnRlbF9kcCwgb2xkX2NydGNfc3RhdGUpOworCWludGVsX2VkcF9i YWNrbGlnaHRfb2ZmKG9sZF9jb25uX3N0YXRlKTsKK30KIAotCWlmICh0eXBlID09IElOVEVMX09V VFBVVF9FRFApIHsKLQkJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9k cChlbmNvZGVyKTsKK3N0YXRpYyB2b2lkIGludGVsX2Rpc2FibGVfZGRpX2hkbWkoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0 YXRlICpvbGRfY29ubl9zdGF0ZSkKK3sKKwlpZiAob2xkX2NydGNfc3RhdGUtPmhhc19hdWRpbykK KwkJaW50ZWxfYXVkaW9fY29kZWNfZGlzYWJsZShlbmNvZGVyKTsKIAotCQlpbnRlbF9lZHBfZHJy c19kaXNhYmxlKGludGVsX2RwLCBvbGRfY3J0Y19zdGF0ZSk7Ci0JCWludGVsX3Bzcl9kaXNhYmxl KGludGVsX2RwLCBvbGRfY3J0Y19zdGF0ZSk7Ci0JCWludGVsX2VkcF9iYWNrbGlnaHRfb2ZmKG9s ZF9jb25uX3N0YXRlKTsKLQl9CisJaW50ZWxfaGRtaV9oYW5kbGVfc2lua19zY3JhbWJsaW5nKGVu Y29kZXIsCisJCQkJCSAgb2xkX2Nvbm5fc3RhdGUtPmNvbm5lY3RvciwKKwkJCQkJICBmYWxzZSwg ZmFsc2UpOworfQorCitzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX2RkaShzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKKwkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZSwKKwkJCSAgICAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0 YXRlICpvbGRfY29ubl9zdGF0ZSkKK3sKKwlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShvbGRfY3J0 Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0hETUkpKQorCQlpbnRlbF9kaXNhYmxlX2RkaV9oZG1pKGVu Y29kZXIsIG9sZF9jcnRjX3N0YXRlLCBvbGRfY29ubl9zdGF0ZSk7CisJZWxzZQorCQlpbnRlbF9k aXNhYmxlX2RkaV9kcChlbmNvZGVyLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUpOwog fQogCiBzdGF0aWMgdm9pZCBieHRfZGRpX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyLAotLSAKMi4xMy41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK