From: Ville Syrjala Subject: [PATCH v2 8/9] drm/i915: Plumb crtc_state etc. directly to intel_ddi_pre_enable_{dp, hdmi}() Date: Tue, 10 Oct 2017 15:12:06 +0300 Message-ID: <20171010121207.570-9-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 023E06E446 for ; Tue, 10 Oct 2017 12:12:34 +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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJh dGhlciB0aGF0IHBsdW1iIHRoZSBsaW5rIHBhcmFtZXRlcnMgc2VwYXJhdGVseSB0bwppbnRlbF9k ZGlfcHJlX2VuYWJsZV9kcCgpIGxldCdzIGp1c3QgcGFzcyB0aGUgZW50aXJlIGNydGMgc3RhdGUu CgppbnRlbF9kZGlfcHJlX2VuYWJsZV9oZG1pKCkgYWxyZWFkeSB0b29rIHRoZSBjcnRjIHN0YXRl LCBidXQgZm9yIHNvbWUKcmVhc29uIGludGVsX2RkaV9wcmVfZW5hYmxlKCkgc3RpbGwgd2FudGVk IHRvIGV4dHJhY3QgaGFzX2luZm9mcmFtZQpmcm9tIHRoZXJlaW4gYW5kIHBhc3MgaXQgaW4gc2Vw YXJhdGVseS4gTGV0J3Mgbm90IGRvIHRoYXQgc2luY2UgaXQncwpwb2ludGxlc3MuCgp2MjogUmVi YXNlIGR1ZSB0byBtb3JlIGNvZGUgZ2V0dGluZyBwdWxsZWQgaW50byB0aGUgRERJIGhvb2tzCgpD YzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmls bGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyB8IDU0ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAzNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCmluZGV4IGM5MzBlZjAzMzhjNS4uNDlj ZjhkOWQyYmMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwpAQCAtMjE1NywyNCArMjE1Nywy NCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfY2xrX2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIpCiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVfZW5hYmxlX2RwKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAotCQkJCSAgICBpbnQgbGlua19yYXRlLCB1aW50 MzJfdCBsYW5lX2NvdW50LAotCQkJCSAgICBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCwK LQkJCQkgICAgYm9vbCBsaW5rX21zdCkKKwkJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCisJCQkJICAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0 YXRlICpjb25uX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9f aW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCWVudW0gcG9ydCBwb3J0ID0gaW50 ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5jb2Rlcik7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxf cG9ydCAqZGlnX3BvcnQgPSBlbmNfdG9fZGlnX3BvcnQoJmVuY29kZXItPmJhc2UpOworCWJvb2wg aXNfbXN0ID0gaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfRFBf TVNUKTsKIAl1aW50MzJfdCBsZXZlbCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CiAK LQlXQVJOX09OKGxpbmtfbXN0ICYmIChwb3J0ID09IFBPUlRfQSB8fCBwb3J0ID09IFBPUlRfRSkp OworCVdBUk5fT04oaXNfbXN0ICYmIChwb3J0ID09IFBPUlRfQSB8fCBwb3J0ID09IFBPUlRfRSkp OwogCi0JaW50ZWxfZHBfc2V0X2xpbmtfcGFyYW1zKGludGVsX2RwLCBsaW5rX3JhdGUsIGxhbmVf Y291bnQsCi0JCQkJIGxpbmtfbXN0KTsKKwlpbnRlbF9kcF9zZXRfbGlua19wYXJhbXMoaW50ZWxf ZHAsIGNydGNfc3RhdGUtPnBvcnRfY2xvY2ssCisJCQkJIGNydGNfc3RhdGUtPmxhbmVfY291bnQs IGlzX21zdCk7CiAKIAlpbnRlbF9lZHBfcGFuZWxfb24oaW50ZWxfZHApOwogCi0JaW50ZWxfZGRp X2Nsa19zZWxlY3QoZW5jb2RlciwgcGxsKTsKKwlpbnRlbF9kZGlfY2xrX3NlbGVjdChlbmNvZGVy LCBjcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCk7CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChk ZXZfcHJpdiwgZGlnX3BvcnQtPmRkaV9pb19wb3dlcl9kb21haW4pOwogCkBAIC0yMTg2LDcgKzIx ODYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKIAkJaW50ZWxfcHJlcGFyZV9kcF9kZGlfYnVmZmVycyhlbmNvZGVy KTsKIAogCWludGVsX2RkaV9pbml0X2RwX2J1Zl9yZWcoZW5jb2Rlcik7Ci0JaWYgKCFsaW5rX21z dCkKKwlpZiAoIWlzX21zdCkKIAkJaW50ZWxfZHBfc2lua19kcG1zKGludGVsX2RwLCBEUk1fTU9E RV9EUE1TX09OKTsKIAlpbnRlbF9kcF9zdGFydF9saW5rX3RyYWluKGludGVsX2RwKTsKIAlpZiAo cG9ydCAhPSBQT1JUX0EgfHwgSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQpAQCAtMjE5NCwxMCAr MjE5NCw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyLAogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJs ZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAotCQkJCSAgICAgIGJvb2wgaGFz X2luZm9mcmFtZSwKIAkJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSwKLQkJCQkgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29u bl9zdGF0ZSwKLQkJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCkK KwkJCQkgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkK IHsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGVuY190b19k aWdfcG9ydCgmZW5jb2Rlci0+YmFzZSk7CiAJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkg PSAmaW50ZWxfZGlnX3BvcnQtPmhkbWk7CkBAIC0yMjA3LDcgKzIyMDUsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9kZGlfcHJlX2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LAogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gZW5jX3RvX2RpZ19wb3J0 KCZlbmNvZGVyLT5iYXNlKTsKIAogCWludGVsX2RwX2R1YWxfbW9kZV9zZXRfdG1kc19vdXRwdXQo aW50ZWxfaGRtaSwgdHJ1ZSk7Ci0JaW50ZWxfZGRpX2Nsa19zZWxlY3QoZW5jb2RlciwgcGxsKTsK KwlpbnRlbF9kZGlfY2xrX3NlbGVjdChlbmNvZGVyLCBjcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCk7 CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgZGlnX3BvcnQtPmRkaV9pb19w b3dlcl9kb21haW4pOwogCkBAIC0yMjIzLDM4ICsyMjIxLDI2IEBAIHN0YXRpYyB2b2lkIGludGVs X2RkaV9wcmVfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCXNr bF9kZGlfc2V0X2lib29zdChlbmNvZGVyLCBsZXZlbCk7CiAKIAlpbnRlbF9kaWdfcG9ydC0+c2V0 X2luZm9mcmFtZXMoJmVuY29kZXItPmJhc2UsCi0JCQkJICAgICAgIGhhc19pbmZvZnJhbWUsCisJ CQkJICAgICAgIGNydGNfc3RhdGUtPmhhc19pbmZvZnJhbWUsCiAJCQkJICAgICAgIGNydGNfc3Rh dGUsIGNvbm5fc3RhdGUpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJsZShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKLQkJCQkgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnLAorCQkJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNv bm5fc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjID0gcGlwZV9jb25maWctPmJhc2Uu Y3J0YzsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMt PmRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNy dGMpOwotCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQlpbnQgdHlwZSA9IGVuY29kZXIt PnR5cGU7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3Rh dGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShjcnRjLT5iYXNlLmRldik7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwogCi0J V0FSTl9PTihpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2Rlcik7CisJV0FSTl9PTihj cnRjX3N0YXRlLT5oYXNfcGNoX2VuY29kZXIpOwogCiAJaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVy cnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGlwZSwgdHJ1ZSk7CiAKLQlpZiAodHlwZSA9PSBJTlRF TF9PVVRQVVRfRFAgfHwgdHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7Ci0JCWludGVsX2RkaV9w cmVfZW5hYmxlX2RwKGVuY29kZXIsCi0JCQkJCXBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAotCQkJ CQlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCwKLQkJCQkJcGlwZV9jb25maWctPnNoYXJlZF9kcGxs LAotCQkJCQlpbnRlbF9jcnRjX2hhc190eXBlKHBpcGVfY29uZmlnLAotCQkJCQkJCSAgICBJTlRF TF9PVVRQVVRfRFBfTVNUKSk7Ci0JfQotCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKSB7 Ci0JCWludGVsX2RkaV9wcmVfZW5hYmxlX2hkbWkoZW5jb2RlciwKLQkJCQkJICBwaXBlX2NvbmZp Zy0+aGFzX2luZm9mcmFtZSwKLQkJCQkJICBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSwKLQkJCQkJ ICBwaXBlX2NvbmZpZy0+c2hhcmVkX2RwbGwpOwotCX0KKwlpZiAoaW50ZWxfY3J0Y19oYXNfdHlw ZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfSERNSSkpCisJCWludGVsX2RkaV9wcmVfZW5hYmxl X2hkbWkoZW5jb2RlciwgY3J0Y19zdGF0ZSwgY29ubl9zdGF0ZSk7CisJZWxzZQorCQlpbnRlbF9k ZGlfcHJlX2VuYWJsZV9kcChlbmNvZGVyLCBjcnRjX3N0YXRlLCBjb25uX3N0YXRlKTsKIH0KIAog c3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9kZGlfYnVmKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyKQotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK