From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 05/13] drm/i915: Pass crtc_state down to bxt dpll funcs Date: Thu, 7 Feb 2019 19:32:22 +0200 Message-ID: <20190207173230.22368-5-ville.syrjala@linux.intel.com> References: <20190207173230.22368-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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4399C6ECA0 for ; Thu, 7 Feb 2019 17:32:46 +0000 (UTC) In-Reply-To: <20190207173230.22368-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNp bXBsaWZ5IHRoZSBjYWxsaW5nIGNvbnZlbnRpb24gb2YgdGhlIGRwbGwgZnVuY3MgYnkgcGx1bWJp bmcKdGhlIGNydGMgc3RhdGUgZGVlcGVyLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgIHwgIDUgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cGxsX21nci5jIHwgNDggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjkgaW5z ZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IDI4Zjk4MDdiYmY2Yy4uY2M4MzIwNmZlMTY2IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC05NDIsMTQgKzk0MiwxNSBAQCBjaHZfZmluZF9iZXN0X2RwbGwo Y29uc3Qgc3RydWN0IGludGVsX2xpbWl0ICpsaW1pdCwKIAlyZXR1cm4gZm91bmQ7CiB9CiAKLWJv b2wgYnh0X2ZpbmRfYmVzdF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LCBpbnQgdGFyZ2V0X2Nsb2NrLAorYm9vbCBieHRfZmluZF9iZXN0X2RwbGwoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQlzdHJ1Y3QgZHBsbCAqYmVzdF9jbG9jaykKIHsK IAlpbnQgcmVmY2xrID0gMTAwMDAwOwogCWNvbnN0IHN0cnVjdCBpbnRlbF9saW1pdCAqbGltaXQg PSAmaW50ZWxfbGltaXRzX2J4dDsKIAogCXJldHVybiBjaHZfZmluZF9iZXN0X2RwbGwobGltaXQs IGNydGNfc3RhdGUsCi0JCQkJICB0YXJnZXRfY2xvY2ssIHJlZmNsaywgTlVMTCwgYmVzdF9jbG9j ayk7CisJCQkJICBjcnRjX3N0YXRlLT5wb3J0X2Nsb2NrLCByZWZjbGssCisJCQkJICBOVUxMLCBi ZXN0X2Nsb2NrKTsKIH0KIAogYm9vbCBpbnRlbF9jcnRjX2FjdGl2ZShzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCmluZGV4IGYwZTNhMGE2 MmRiMC4uM2RlNjJjNzA0NTgwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcGxsX21nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMK QEAgLTE2ODgsMTAgKzE2ODgsMTAgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBieHRfY2xrX2RpdiBi eHRfZHBfY2xrX3ZhbFtdID0gewogfTsKIAogc3RhdGljIGJvb2wKLWJ4dF9kZGlfaGRtaV9wbGxf ZGl2aWRlcnMoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCi0JCQkgIHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLCBpbnQgY2xvY2ssCitieHRfZGRpX2hkbWlfcGxsX2Rp dmlkZXJzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICBzdHJ1Y3Qg Ynh0X2Nsa19kaXYgKmNsa19kaXYpCiB7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19p bnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRwbGwgYmVzdF9jbG9j azsKIAogCS8qIENhbGN1bGF0ZSBIRE1JIGRpdiAqLwpAQCAtMTY5OSw5ICsxNjk5LDEwIEBAIGJ4 dF9kZGlfaGRtaV9wbGxfZGl2aWRlcnMoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJ ICogRklYTUU6IHRpZSB0aGUgZm9sbG93aW5nIGNhbGN1bGF0aW9uIGludG8KIAkgKiBpOXh4X2Ny dGNfY29tcHV0ZV9jbG9jawogCSAqLwotCWlmICghYnh0X2ZpbmRfYmVzdF9kcGxsKGNydGNfc3Rh dGUsIGNsb2NrLCAmYmVzdF9jbG9jaykpIHsKKwlpZiAoIWJ4dF9maW5kX2Jlc3RfZHBsbChjcnRj X3N0YXRlLCAmYmVzdF9jbG9jaykpIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigibm8gUExMIGRpdmlk ZXJzIGZvdW5kIGZvciBjbG9jayAlZCBwaXBlICVjXG4iLAotCQkJCSBjbG9jaywgcGlwZV9uYW1l KGludGVsX2NydGMtPnBpcGUpKTsKKwkJCQkgY3J0Y19zdGF0ZS0+cG9ydF9jbG9jaywKKwkJCQkg cGlwZV9uYW1lKGNydGMtPnBpcGUpKTsKIAkJcmV0dXJuIGZhbHNlOwogCX0KIApAQCAtMTcxOCw4 ICsxNzE5LDEwIEBAIGJ4dF9kZGlfaGRtaV9wbGxfZGl2aWRlcnMoc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMsCiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyB2b2lkIGJ4dF9kZGlfZHBf cGxsX2RpdmlkZXJzKGludCBjbG9jaywgc3RydWN0IGJ4dF9jbGtfZGl2ICpjbGtfZGl2KQorc3Rh dGljIHZvaWQgYnh0X2RkaV9kcF9wbGxfZGl2aWRlcnMoc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCisJCQkJICAgIHN0cnVjdCBieHRfY2xrX2RpdiAqY2xrX2RpdikKIHsKKwlp bnQgY2xvY2sgPSBjcnRjX3N0YXRlLT5wb3J0X2Nsb2NrOwogCWludCBpOwogCiAJKmNsa19kaXYg PSBieHRfZHBfY2xrX3ZhbFswXTsKQEAgLTE3MzMsMTAgKzE3MzYsMTEgQEAgc3RhdGljIHZvaWQg Ynh0X2RkaV9kcF9wbGxfZGl2aWRlcnMoaW50IGNsb2NrLCBzdHJ1Y3QgYnh0X2Nsa19kaXYgKmNs a19kaXYpCiAJY2xrX2Rpdi0+dmNvID0gY2xvY2sgKiAxMCAvIDIgKiBjbGtfZGl2LT5wMSAqIGNs a19kaXYtPnAyOwogfQogCi1zdGF0aWMgYm9vbCBieHRfZGRpX3NldF9kcGxsX2h3X3N0YXRlKGlu dCBjbG9jaywKLQkJCSAgc3RydWN0IGJ4dF9jbGtfZGl2ICpjbGtfZGl2LAotCQkJICBzdHJ1Y3Qg aW50ZWxfZHBsbF9od19zdGF0ZSAqZHBsbF9od19zdGF0ZSkKK3N0YXRpYyBib29sIGJ4dF9kZGlf c2V0X2RwbGxfaHdfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJ CQkJICAgICAgc3RydWN0IGJ4dF9jbGtfZGl2ICpjbGtfZGl2LAorCQkJCSAgICAgIHN0cnVjdCBp bnRlbF9kcGxsX2h3X3N0YXRlICpkcGxsX2h3X3N0YXRlKQogeworCWludCBjbG9jayA9IGNydGNf c3RhdGUtPnBvcnRfY2xvY2s7CiAJaW50IHZjbyA9IGNsa19kaXYtPnZjbzsKIAl1MzIgcHJvcF9j b2VmLCBpbnRfY29lZiwgZ2Fpbl9jdGwsIHRhcmdfY250OwogCXUzMiBsYW5lc3RhZ2dlcjsKQEAg LTE4MDAsMjYgKzE4MDQsMjUgQEAgc3RhdGljIGJvb2wgYnh0X2RkaV9zZXRfZHBsbF9od19zdGF0 ZShpbnQgY2xvY2ssCiB9CiAKIHN0YXRpYyBib29sCi1ieHRfZGRpX2RwX3NldF9kcGxsX2h3X3N0 YXRlKGludCBjbG9jaywKK2J4dF9kZGlfZHBfc2V0X2RwbGxfaHdfc3RhdGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9kcGxsX2h3X3N0 YXRlICpkcGxsX2h3X3N0YXRlKQogewotCXN0cnVjdCBieHRfY2xrX2RpdiBjbGtfZGl2ID0gezB9 OworCXN0cnVjdCBieHRfY2xrX2RpdiBjbGtfZGl2ID0ge307CiAKLQlieHRfZGRpX2RwX3BsbF9k aXZpZGVycyhjbG9jaywgJmNsa19kaXYpOworCWJ4dF9kZGlfZHBfcGxsX2RpdmlkZXJzKGNydGNf c3RhdGUsICZjbGtfZGl2KTsKIAotCXJldHVybiBieHRfZGRpX3NldF9kcGxsX2h3X3N0YXRlKGNs b2NrLCAmY2xrX2RpdiwgZHBsbF9od19zdGF0ZSk7CisJcmV0dXJuIGJ4dF9kZGlfc2V0X2RwbGxf aHdfc3RhdGUoY3J0Y19zdGF0ZSwgJmNsa19kaXYsIGRwbGxfaHdfc3RhdGUpOwogfQogCiBzdGF0 aWMgYm9vbAotYnh0X2RkaV9oZG1pX3NldF9kcGxsX2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjLAotCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLCBpbnQgY2xvY2ssCitieHRfZGRpX2hkbWlfc2V0X2RwbGxfaHdfc3RhdGUoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgICAgICAgc3RydWN0IGludGVsX2RwbGxf aHdfc3RhdGUgKmRwbGxfaHdfc3RhdGUpCiB7Ci0Jc3RydWN0IGJ4dF9jbGtfZGl2IGNsa19kaXYg PSB7IH07CisJc3RydWN0IGJ4dF9jbGtfZGl2IGNsa19kaXYgPSB7fTsKIAotCWJ4dF9kZGlfaGRt aV9wbGxfZGl2aWRlcnMoaW50ZWxfY3J0YywgY3J0Y19zdGF0ZSwgY2xvY2ssICZjbGtfZGl2KTsK KwlieHRfZGRpX2hkbWlfcGxsX2RpdmlkZXJzKGNydGNfc3RhdGUsICZjbGtfZGl2KTsKIAotCXJl dHVybiBieHRfZGRpX3NldF9kcGxsX2h3X3N0YXRlKGNsb2NrLCAmY2xrX2RpdiwgZHBsbF9od19z dGF0ZSk7CisJcmV0dXJuIGJ4dF9kZGlfc2V0X2RwbGxfaHdfc3RhdGUoY3J0Y19zdGF0ZSwgJmNs a19kaXYsIGRwbGxfaHdfc3RhdGUpOwogfQogCiBzdGF0aWMgc3RydWN0IGludGVsX3NoYXJlZF9k cGxsICoKQEAgLTE4MzAsMTUgKzE4MzMsMTQgQEAgYnh0X2dldF9kcGxsKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXN0cnVjdCBpbnRlbF9kcGxsX2h3X3N0YXRlIGRwbGxf aHdfc3RhdGUgPSB7IH07CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShjcnRjLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGw7Ci0J aW50IGksIGNsb2NrID0gY3J0Y19zdGF0ZS0+cG9ydF9jbG9jazsKKwllbnVtIGludGVsX2RwbGxf aWQgaWQ7CiAKIAlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQ VVRfSERNSSkgJiYKLQkgICAgIWJ4dF9kZGlfaGRtaV9zZXRfZHBsbF9od19zdGF0ZShjcnRjLCBj cnRjX3N0YXRlLCBjbG9jaywKLQkJCQkJICAgICZkcGxsX2h3X3N0YXRlKSkKKwkgICAgIWJ4dF9k ZGlfaGRtaV9zZXRfZHBsbF9od19zdGF0ZShjcnRjX3N0YXRlLCAmZHBsbF9od19zdGF0ZSkpCiAJ CXJldHVybiBOVUxMOwogCiAJaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIoY3J0Y19zdGF0 ZSkgJiYKLQkgICAgIWJ4dF9kZGlfZHBfc2V0X2RwbGxfaHdfc3RhdGUoY2xvY2ssICZkcGxsX2h3 X3N0YXRlKSkKKwkgICAgIWJ4dF9kZGlfZHBfc2V0X2RwbGxfaHdfc3RhdGUoY3J0Y19zdGF0ZSwg JmRwbGxfaHdfc3RhdGUpKQogCQlyZXR1cm4gTlVMTDsKIAogCW1lbXNldCgmY3J0Y19zdGF0ZS0+ ZHBsbF9od19zdGF0ZSwgMCwKQEAgLTE4NDcsOCArMTg0OSw4IEBAIGJ4dF9nZXRfZHBsbChzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAljcnRjX3N0YXRlLT5kcGxsX2h3X3N0 YXRlID0gZHBsbF9od19zdGF0ZTsKIAogCS8qIDE6MSBtYXBwaW5nIGJldHdlZW4gcG9ydHMgYW5k IFBMTHMgKi8KLQlpID0gKGVudW0gaW50ZWxfZHBsbF9pZCkgZW5jb2Rlci0+cG9ydDsKLQlwbGwg PSBpbnRlbF9nZXRfc2hhcmVkX2RwbGxfYnlfaWQoZGV2X3ByaXYsIGkpOworCWlkID0gKGVudW0g aW50ZWxfZHBsbF9pZCkgZW5jb2Rlci0+cG9ydDsKKwlwbGwgPSBpbnRlbF9nZXRfc2hhcmVkX2Rw bGxfYnlfaWQoZGV2X3ByaXYsIGlkKTsKIAogCURSTV9ERUJVR19LTVMoIltDUlRDOiVkOiVzXSB1 c2luZyBwcmUtYWxsb2NhdGVkICVzXG4iLAogCQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsIGNy dGMtPmJhc2UubmFtZSwgcGxsLT5pbmZvLT5uYW1lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK aW5kZXggOWVjM2QwMGZiZDE5Li5hYWJjM2ZmZGI5NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCkBAIC0xNzM4LDcgKzE3MzgsNyBAQCB2b2lkIGludGVsX2RwX2dldF9tX24oc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCiB2b2lkIGludGVsX2RwX3NldF9tX24oY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAgICAgIGVudW0gbGlua19tX25fc2V0IG1fbik7 CiBpbnQgaW50ZWxfZG90Y2xvY2tfY2FsY3VsYXRlKGludCBsaW5rX2ZyZXEsIGNvbnN0IHN0cnVj dCBpbnRlbF9saW5rX21fbiAqbV9uKTsKLWJvb2wgYnh0X2ZpbmRfYmVzdF9kcGxsKHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLCBpbnQgdGFyZ2V0X2Nsb2NrLAorYm9vbCBieHRf ZmluZF9iZXN0X2RwbGwoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQlz dHJ1Y3QgZHBsbCAqYmVzdF9jbG9jayk7CiBpbnQgY2h2X2NhbGNfZHBsbF9wYXJhbXMoaW50IHJl ZmNsaywgc3RydWN0IGRwbGwgKnBsbF9jbG9jayk7CiAKLS0gCjIuMTkuMgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==