From: Manasi Navare Subject: [PATCH v2 3/9] drm/i915: Split intel_ddi_pre_enable() into DP and HDMI versions Date: Mon, 22 Aug 2016 18:41:02 -0700 Message-ID: <1471916468-30588-3-git-send-email-manasi.d.navare@intel.com> References: <1471916468-30588-1-git-send-email-manasi.d.navare@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 263A56E58A for ; Tue, 23 Aug 2016 01:27:52 +0000 (UTC) In-Reply-To: <1471916468-30588-1-git-send-email-manasi.d.navare@intel.com> In-Reply-To: <1470770143-5163-1-git-send-email-manasi.d.navare@intel.com> References: <1470770143-5163-1-git-send-email-manasi.d.navare@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xp dmVpcmFAaW50ZWwuY29tPgoKU3BsaXQgaW50ZWxfZGRpX3ByZV9lbmFibGUoKSBpbnRvIGVuY29k ZXIgdHlwZSBzcGVjaWZpYyB2ZXJzaW9ucyB0aGF0CmRvbid0IGRlcGVuZCBvbiBjcnRjX3N0YXRl LiBUaGUgbmVjZXNzYXJ5IHBhcmFtZXRlcnMgYXJlIHBhc3NlZCBhcwpmdW5jdGlvbiBhcmd1bWVu dHMuIFRoaXMgc3BsaXQgd2lsbCBiZSBuZWNlc3NhcnkgZm9yIGltcGxlbWVudGluZyBEUAp1cGZy b250IGxpbmsgdHJhaW5pbmcuCgp2MjoKKiBSZWJhc2VkIG9udG8ga2VybmVsIHY0LjcgKEppbSkK ClJldmlld2VkLWJ5OiBEdXJnYWRvc3MgUiA8ZHVyZ2Fkb3NzLnJAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5v bGl2ZWlyYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEppbSBCcmlkZSA8amltLmJyaWRlQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyB8IDk4 ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA1NiBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rk aS5jCmluZGV4IDhjODdkMjEuLmUyNGRjYzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBA IC0xNjI5LDY0ICsxNjI5LDc4IEBAIHZvaWQgaW50ZWxfZGRpX2Nsa19zZWxlY3Qoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAkJSTkxNV9XUklURShEUExMX0NUUkwyLCB2YWwpOwog Ci0JfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuIDwgOSkgeworCX0gZWxzZSBp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkpIHsKIAkJSTkxNV9XUklURShQT1JUX0NMS19TRUwo cG9ydCksIGhzd19wbGxfdG9fZGRpX3BsbF9zZWwocGxsKSk7CiAJfQogfQogCi1zdGF0aWMgdm9p ZCBpbnRlbF9kZGlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2Rl cikKK3N0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyLAorCQkJCSAgICBpbnQgbGlua19yYXRlLCB1aW50MzJfdCBsYW5lX2NvdW50 LAorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCwKKwkJCQkgICAgYm9vbCBs aW5rX21zdCkKIHsKLQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSAmaW50ZWxfZW5jb2Rl ci0+YmFzZTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVu Y29kZXItPmRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGVu Y29kZXItPmNydGMpOwotCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3Bv cnQoaW50ZWxfZW5jb2Rlcik7Ci0JaW50IHR5cGUgPSBpbnRlbF9lbmNvZGVyLT50eXBlOwotCi0J aWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpIHsKLQkJc3RydWN0IGludGVsX2hkbWkgKmlu dGVsX2hkbWkgPSBlbmNfdG9faW50ZWxfaGRtaShlbmNvZGVyKTsKKwlzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKKwll bnVtIHBvcnQgcG9ydCA9IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0KGVuY29kZXIpOwogCi0J CWludGVsX2RwX2R1YWxfbW9kZV9zZXRfdG1kc19vdXRwdXQoaW50ZWxfaGRtaSwgdHJ1ZSk7Ci0J fQorCWludGVsX2RwX3NldF9saW5rX3BhcmFtcyhpbnRlbF9kcCwgbGlua19yYXRlLCBsYW5lX2Nv dW50LAorCQkJCSBsaW5rX21zdCk7CiAKLQlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7 Ci0JCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoZW5jb2Rlcik7 CisJaWYgKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkKIAkJaW50ZWxfZWRwX3Bh bmVsX29uKGludGVsX2RwKTsKLQl9Ci0KLQlpbnRlbF9kZGlfY2xrX3NlbGVjdChpbnRlbF9lbmNv ZGVyLCBjcnRjLT5jb25maWctPnNoYXJlZF9kcGxsKTsKIAotCWlmICh0eXBlID09IElOVEVMX09V VFBVVF9EUCB8fCB0eXBlID09IElOVEVMX09VVFBVVF9FRFApIHsKLQkJc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcChlbmNvZGVyKTsKKwlpbnRlbF9kZGlfY2xrX3Nl bGVjdChlbmNvZGVyLCBwbGwpOworCWludGVsX3ByZXBhcmVfZHBfZGRpX2J1ZmZlcnMoZW5jb2Rl cik7CisJaW50ZWxfZGRpX2luaXRfZHBfYnVmX3JlZyhlbmNvZGVyKTsKKwlpbnRlbF9kcF9zaW5r X2RwbXMoaW50ZWxfZHAsIERSTV9NT0RFX0RQTVNfT04pOworCWludGVsX2RwX3N0YXJ0X2xpbmtf dHJhaW4oaW50ZWxfZHApOworCWlmIChwb3J0ICE9IFBPUlRfQSB8fCBJTlRFTF9HRU4oZGV2X3By aXYpID49IDkpCisJCWludGVsX2RwX3N0b3BfbGlua190cmFpbihpbnRlbF9kcCk7Cit9CiAKLQkJ aW50ZWxfcHJlcGFyZV9kcF9kZGlfYnVmZmVycyhpbnRlbF9lbmNvZGVyKTsKK3N0YXRpYyB2b2lk IGludGVsX2RkaV9wcmVfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIs CisJCQkJICAgICAgYm9vbCBoYXNfaGRtaV9zaW5rLAorCQkJCSAgICAgIHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICphZGp1c3RlZF9tb2RlLAorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9zaGFyZWRf ZHBsbCAqcGxsKQoreworCXN0cnVjdCBpbnRlbF9oZG1pICppbnRlbF9oZG1pID0gZW5jX3RvX2lu dGVsX2hkbWkoJmVuY29kZXItPmJhc2UpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOworCXN0cnVjdCBkcm1fZW5jb2RlciAq ZHJtX2VuY29kZXIgPSAmZW5jb2Rlci0+YmFzZTsKKwllbnVtIHBvcnQgcG9ydCA9IGludGVsX2Rk aV9nZXRfZW5jb2Rlcl9wb3J0KGVuY29kZXIpOworCWludCBsZXZlbCA9IGludGVsX2RkaV9oZG1p X2xldmVsKGRldl9wcml2LCBwb3J0KTsKIAotCQlpbnRlbF9kcF9zZXRfbGlua19wYXJhbXMoaW50 ZWxfZHAsIGNydGMtPmNvbmZpZy0+cG9ydF9jbG9jaywKLQkJCQkJIGNydGMtPmNvbmZpZy0+bGFu ZV9jb3VudCwKLQkJCQkJIGludGVsX2NydGNfaGFzX3R5cGUoY3J0Yy0+Y29uZmlnLAotCQkJCQkJ CSAgICAgSU5URUxfT1VUUFVUX0RQX01TVCkpOworCWludGVsX2RwX2R1YWxfbW9kZV9zZXRfdG1k c19vdXRwdXQoaW50ZWxfaGRtaSwgdHJ1ZSk7CisJaW50ZWxfZGRpX2Nsa19zZWxlY3QoZW5jb2Rl ciwgcGxsKTsKKwlpbnRlbF9wcmVwYXJlX2hkbWlfZGRpX2J1ZmZlcnMoZW5jb2Rlcik7CiAKLQkJ aW50ZWxfZGRpX2luaXRfZHBfYnVmX3JlZyhpbnRlbF9lbmNvZGVyKTsKKwlpZiAoSVNfU0tZTEFL RShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQorCQlza2xfZGRpX3NldF9pYm9v c3QoZW5jb2RlciwgbGV2ZWwpOworCWVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQorCQli eHRfZGRpX3Zzd2luZ19zZXF1ZW5jZShkZXZfcHJpdiwgbGV2ZWwsIHBvcnQsCisJCQkJCUlOVEVM X09VVFBVVF9IRE1JKTsKIAotCQlpbnRlbF9kcF9zaW5rX2RwbXMoaW50ZWxfZHAsIERSTV9NT0RF X0RQTVNfT04pOwotCQlpbnRlbF9kcF9zdGFydF9saW5rX3RyYWluKGludGVsX2RwKTsKLQkJaWYg KHBvcnQgIT0gUE9SVF9BIHx8IElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOSkKLQkJCWlu dGVsX2RwX3N0b3BfbGlua190cmFpbihpbnRlbF9kcCk7Ci0JfSBlbHNlIGlmICh0eXBlID09IElO VEVMX09VVFBVVF9IRE1JKSB7Ci0JCXN0cnVjdCBpbnRlbF9oZG1pICppbnRlbF9oZG1pID0gZW5j X3RvX2ludGVsX2hkbWkoZW5jb2Rlcik7Ci0JCWludCBsZXZlbCA9IGludGVsX2RkaV9oZG1pX2xl dmVsKGRldl9wcml2LCBwb3J0KTsKKwlpbnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcyhkcm1fZW5j b2RlciwgaGFzX2hkbWlfc2luaywgYWRqdXN0ZWRfbW9kZSk7Cit9CiAKLQkJaW50ZWxfcHJlcGFy ZV9oZG1pX2RkaV9idWZmZXJzKGludGVsX2VuY29kZXIpOworc3RhdGljIHZvaWQgaW50ZWxfZGRp X3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIpCit7CisJc3Ry dWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmludGVsX2VuY29kZXItPmJhc2U7CisJc3RydWN0 IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXItPmNydGMpOworCWludCB0 eXBlID0gaW50ZWxfZW5jb2Rlci0+dHlwZTsKIAotCQlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikg fHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQotCQkJc2tsX2RkaV9zZXRfaWJvb3N0KGludGVsX2Vu Y29kZXIsIGxldmVsKTsKLQkJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCi0JCQlieHRf ZGRpX3Zzd2luZ19zZXF1ZW5jZShkZXZfcHJpdiwgbGV2ZWwsIHBvcnQsCi0JCQkJCQlJTlRFTF9P VVRQVVRfSERNSSk7CisJaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0RQIHx8IHR5cGUgPT0gSU5U RUxfT1VUUFVUX0VEUCkKKwkJaW50ZWxfZGRpX3ByZV9lbmFibGVfZHAoaW50ZWxfZW5jb2RlciwK KwkJCQkJY3J0Yy0+Y29uZmlnLT5wb3J0X2Nsb2NrLAorCQkJCQljcnRjLT5jb25maWctPmxhbmVf Y291bnQsCisJCQkJCWNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGwsCisJCQkJCWludGVsX2NydGNf aGFzX3R5cGUoY3J0Yy0+Y29uZmlnLAorCQkJCQkJCSAgICBJTlRFTF9PVVRQVVRfRFBfTVNUKSk7 CiAKLQkJaW50ZWxfaGRtaS0+c2V0X2luZm9mcmFtZXMoZW5jb2RlciwKLQkJCQkJICAgY3J0Yy0+ Y29uZmlnLT5oYXNfaGRtaV9zaW5rLAotCQkJCQkgICAmY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVz dGVkX21vZGUpOwotCX0KKwlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfSERNSSkKKwkJaW50ZWxf ZGRpX3ByZV9lbmFibGVfaGRtaShpbnRlbF9lbmNvZGVyLAorCQkJCQljcnRjLT5jb25maWctPmhh c19oZG1pX3NpbmssCisJCQkJCSZjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZSwKKwkJ CQkJY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2Rk aV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIpCi0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==