From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 06/13] drm/i915: Make pll functions take crtc_state, v2. Date: Thu, 4 Oct 2018 11:45:57 +0200 Message-ID: <20181004094604.2646-7-maarten.lankhorst@linux.intel.com> References: <20181004094604.2646-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id EBFCB6E599 for ; Thu, 4 Oct 2018 09:46:09 +0000 (UTC) In-Reply-To: <20181004094604.2646-1-maarten.lankhorst@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 SW5zdGVhZCBvZiBwYXNzaW5nIGNydGMgYW5kIGRlcmVmZXJlbmNpbmcgY3J0Yy0+Y29uZmlnLApw YXNzcyB0aGUgY29ycmVjdCBjcnRjX3N0YXRlIGFuZCBvYnRhaW4gdGhlIGNydGMgcG9pbnRlciBm cm9tIHRoZXJlLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBNb3ZlIHZsdi9jaHYgY2hhbmdlcyBhbmQg aTl4eF9zZXRfcGxsX2RpdmlkZXJzIGNoYW5nZXMKICBmcm9tIGNydGNfZW5hYmxlL2Rpc2FibGUg cGF0Y2hlcyB0byBoZXJlLgotIEFkZCBjb21taXQgbWVzc2FnZS4KClNpZ25lZC1vZmYtYnk6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmll d2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDM3ICsrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYmMxMjM4 NjI4MTM4Li5lNmY4ZGJiMTdkZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTE1NjUsMTQgKzE1NjUsMTUgQEAgc3RhdGljIHZvaWQgaTl4eF9lbmFibGVfcGxsKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAogCX0KIH0KIAotc3RhdGljIHZvaWQgaTl4eF9kaXNhYmxlX3Bs bChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGk5eHhfZGlzYWJsZV9wbGwo Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CisJc3RydWN0IGlu dGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRl dik7CiAJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwogCiAJLyogRGlzYWJsZSBEVk8gMngg Y2xvY2sgb24gYm90aCBQTExzIGlmIG5lY2Vzc2FyeSAqLwogCWlmIChJU19JODMwKGRldl9wcml2 KSAmJgotCSAgICBpbnRlbF9jcnRjX2hhc190eXBlKGNydGMtPmNvbmZpZywgSU5URUxfT1VUUFVU X0RWTykgJiYKKwkgICAgaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQ VVRfRFZPKSAmJgogCSAgICAhaW50ZWxfbnVtX2R2b19waXBlcyhkZXZfcHJpdikpIHsKIAkJSTkx NV9XUklURShEUExMKFBJUEVfQiksCiAJCQkgICBJOTE1X1JFQUQoRFBMTChQSVBFX0IpKSAmIH5E UExMX0RWT18yWF9NT0RFKTsKQEAgLTQzMjMsMTAgKzQzMjQsMTAgQEAgc3RhdGljIHZvaWQgaXZi X21hbnVhbF9mZGlfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlEUk1fREVC VUdfS01TKCJGREkgdHJhaW4gZG9uZS5cbiIpOwogfQogCi1zdGF0aWMgdm9pZCBpcm9ubGFrZV9m ZGlfcGxsX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKK3N0YXRpYyB2b2lk IGlyb25sYWtlX2ZkaV9wbGxfZW5hYmxlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNl LmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3Rh dGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShpbnRlbF9jcnRjLT5iYXNlLmRldik7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBl OwogCWk5MTVfcmVnX3QgcmVnOwogCXUzMiB0ZW1wOwpAQCAtNDMzNSw3ICs0MzM2LDcgQEAgc3Rh dGljIHZvaWQgaXJvbmxha2VfZmRpX3BsbF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMpCiAJcmVnID0gRkRJX1JYX0NUTChwaXBlKTsKIAl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7 CiAJdGVtcCAmPSB+KEZESV9EUF9QT1JUX1dJRFRIX01BU0sgfCAoMHg3IDw8IDE2KSk7Ci0JdGVt cCB8PSBGRElfRFBfUE9SVF9XSURUSChpbnRlbF9jcnRjLT5jb25maWctPmZkaV9sYW5lcyk7CisJ dGVtcCB8PSBGRElfRFBfUE9SVF9XSURUSChjcnRjX3N0YXRlLT5mZGlfbGFuZXMpOwogCXRlbXAg fD0gKEk5MTVfUkVBRChQSVBFQ09ORihwaXBlKSkgJiBQSVBFQ09ORl9CUENfTUFTSykgPDwgMTE7 CiAJSTkxNV9XUklURShyZWcsIHRlbXAgfCBGRElfUlhfUExMX0VOQUJMRSk7CiAKQEAgLTU2MTQs NyArNTYxNSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJLyogTm90ZTogRkRJIFBMTCBlbmFibGluZyBf bXVzdF8gYmUgZG9uZSBiZWZvcmUgd2UgZW5hYmxlIHRoZQogCQkgKiBjcHUgcGlwZXMsIGhlbmNl IHRoaXMgaXMgc2VwYXJhdGUgZnJvbSBhbGwgdGhlIG90aGVyIGZkaS9wY2gKIAkJICogZW5hYmxp bmcuICovCi0JCWlyb25sYWtlX2ZkaV9wbGxfZW5hYmxlKGludGVsX2NydGMpOworCQlpcm9ubGFr ZV9mZGlfcGxsX2VuYWJsZShwaXBlX2NvbmZpZyk7CiAJfSBlbHNlIHsKIAkJYXNzZXJ0X2ZkaV90 eF9kaXNhYmxlZChkZXZfcHJpdiwgcGlwZSk7CiAJCWFzc2VydF9mZGlfcnhfZGlzYWJsZWQoZGV2 X3ByaXYsIHBpcGUpOwpAQCAtNjA4MSwxMSArNjA4MiwxMSBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2 aWV3X2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAlp bnRlbF9lbmNvZGVyc19wcmVfcGxsX2VuYWJsZShjcnRjLCBwaXBlX2NvbmZpZywgb2xkX3N0YXRl KTsKIAogCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewotCQljaHZfcHJlcGFyZV9wbGwo aW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29uZmlnKTsKLQkJY2h2X2VuYWJsZV9wbGwoaW50ZWxf Y3J0YywgaW50ZWxfY3J0Yy0+Y29uZmlnKTsKKwkJY2h2X3ByZXBhcmVfcGxsKGludGVsX2NydGMs IHBpcGVfY29uZmlnKTsKKwkJY2h2X2VuYWJsZV9wbGwoaW50ZWxfY3J0YywgcGlwZV9jb25maWcp OwogCX0gZWxzZSB7Ci0JCXZsdl9wcmVwYXJlX3BsbChpbnRlbF9jcnRjLCBpbnRlbF9jcnRjLT5j b25maWcpOwotCQl2bHZfZW5hYmxlX3BsbChpbnRlbF9jcnRjLCBpbnRlbF9jcnRjLT5jb25maWcp OworCQl2bHZfcHJlcGFyZV9wbGwoaW50ZWxfY3J0YywgcGlwZV9jb25maWcpOworCQl2bHZfZW5h YmxlX3BsbChpbnRlbF9jcnRjLCBwaXBlX2NvbmZpZyk7CiAJfQogCiAJaW50ZWxfZW5jb2RlcnNf cHJlX2VuYWJsZShjcnRjLCBwaXBlX2NvbmZpZywgb2xkX3N0YXRlKTsKQEAgLTYxMDQsMTMgKzYx MDUsMTMgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJaW50ZWxfZW5jb2RlcnNfZW5hYmxlKGNydGMsIHBp cGVfY29uZmlnLCBvbGRfc3RhdGUpOwogfQogCi1zdGF0aWMgdm9pZCBpOXh4X3NldF9wbGxfZGl2 aWRlcnMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBpOXh4X3NldF9wbGxf ZGl2aWRlcnMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAotCUk5 MTVfV1JJVEUoRlAwKGNydGMtPnBpcGUpLCBjcnRjLT5jb25maWctPmRwbGxfaHdfc3RhdGUuZnAw KTsKLQlJOTE1X1dSSVRFKEZQMShjcnRjLT5waXBlKSwgY3J0Yy0+Y29uZmlnLT5kcGxsX2h3X3N0 YXRlLmZwMSk7CisJSTkxNV9XUklURShGUDAoY3J0Yy0+cGlwZSksIGNydGNfc3RhdGUtPmRwbGxf aHdfc3RhdGUuZnAwKTsKKwlJOTE1X1dSSVRFKEZQMShjcnRjLT5waXBlKSwgY3J0Y19zdGF0ZS0+ ZHBsbF9od19zdGF0ZS5mcDEpOwogfQogCiBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZW5hYmxlKHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKQEAgLTYxMjcsNyArNjEyOCw3IEBA IHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBp cGVfY29uZmlnLAogCWlmIChXQVJOX09OKGludGVsX2NydGMtPmFjdGl2ZSkpCiAJCXJldHVybjsK IAotCWk5eHhfc2V0X3BsbF9kaXZpZGVycyhpbnRlbF9jcnRjKTsKKwlpOXh4X3NldF9wbGxfZGl2 aWRlcnMocGlwZV9jb25maWcpOwogCiAJaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIoaW50 ZWxfY3J0Yy0+Y29uZmlnKSkKIAkJaW50ZWxfZHBfc2V0X21fbihpbnRlbF9jcnRjLCBNMV9OMSk7 CkBAIC02MjExLDcgKzYyMTIsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCWVsc2UgaWYgKElTX1ZBTExF WVZJRVcoZGV2X3ByaXYpKQogCQkJdmx2X2Rpc2FibGVfcGxsKGRldl9wcml2LCBwaXBlKTsKIAkJ ZWxzZQotCQkJaTl4eF9kaXNhYmxlX3BsbChpbnRlbF9jcnRjKTsKKwkJCWk5eHhfZGlzYWJsZV9w bGwob2xkX2NydGNfc3RhdGUpOwogCX0KIAogCWludGVsX2VuY29kZXJzX3Bvc3RfcGxsX2Rpc2Fi bGUoY3J0Yywgb2xkX2NydGNfc3RhdGUsIG9sZF9zdGF0ZSk7Ci0tIAoyLjE5LjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=