From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 09/24] drm/i915: Assign a new pll from the crtc check function. Date: Mon, 1 Jun 2015 15:27:12 +0200 Message-ID: <1433165247-15928-10-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433165247-15928-1-git-send-email-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id D56466E603 for ; Mon, 1 Jun 2015 06:27:44 -0700 (PDT) In-Reply-To: <1433165247-15928-1-git-send-email-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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2 MCArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy NiBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggOTQxMDFkMWY3ODRjLi5jNzRlMzUzZDkxNTIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExNDUwLDExICsxMTQ1MCwxMiBAQCBzdGF0aWMgaW50 IGludGVsX2F0b21pY19jaGVja19jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQog CQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSA9IGNydGNfc3RhdGUtPnN0YXRlOwotCWludCBpZHggPSBjcnRjLT5iYXNlLmlk OworCWludCByZXQsIGlkeCA9IGNydGMtPmJhc2UuaWQ7CiAJYm9vbCBpc19jcnRjX2VuYWJsZWQg PSBjcnRjX3N0YXRlLT5hY3RpdmU7CiAJYm9vbCB3YXNfY3J0Y19lbmFibGVkID0gY3J0Yy0+c3Rh dGUtPmFjdGl2ZTsKIAlib29sIG1vZGVfY2hhbmdlZCA9IG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0 ZSk7CkBAIC0xMTQ2OCw2ICsxMTQ2OSwxNSBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVj a19jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJIltDUlRDOiVpXSBtaXNtYXRjaCBiZXR3 ZWVuIHN0YXRlLT5hY3RpdmUoJWkpIGFuZCBjcnRjLT5hY3RpdmUoJWkpXG4iLAogCQlpZHgsIGNy dGMtPnN0YXRlLT5hY3RpdmUsIGludGVsX2NydGMtPmFjdGl2ZSk7CiAKKwlpZiAobW9kZV9jaGFu Z2VkICYmIGNydGNfc3RhdGUtPmVuYWJsZSAmJgorCSAgICBkZXZfcHJpdi0+ZGlzcGxheS5jcnRj X2NvbXB1dGVfY2xvY2sgJiYKKwkgICAgIVdBUk5fT04ocGlwZV9jb25maWctPnNoYXJlZF9kcGxs ICE9IERQTExfSURfUFJJVkFURSkpIHsKKwkJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19j b21wdXRlX2Nsb2NrKGludGVsX2NydGMsCisJCQkJCQkJICAgcGlwZV9jb25maWcpOworCQlpZiAo cmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CisKIAlEUk1fREVCVUdfQVRPTUlDKCJDcnRjICVpIHdh cyBlbmFibGVkICVpIG5vdyBlbmFibGVkOiAlaVxuIiwKIAkJCSBpZHgsIHdhc19jcnRjX2VuYWJs ZWQsIGlzX2NydGNfZW5hYmxlZCk7CiAKQEAgLTEyNDg4LDUzICsxMjQ5OCwzNyBAQCBzdGF0aWMg dm9pZCB1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQlj cnRjLT5zY2FubGluZV9vZmZzZXQgPSAxOwogfQogCi1zdGF0aWMgaW50IGludGVsX21vZGVzZXRf c2V0dXBfcGxscyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCitzdGF0aWMgdm9pZCBp bnRlbF9tb2Rlc2V0X2NsZWFyX3BsbHMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQog ewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQl1bnNpZ25lZCBjbGVhcl9waXBl cyA9IDA7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2NvbmZpZyAqc2hhcmVkX2RwbGwgPSBO VUxMOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwogCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICppbnRlbF9jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0JaW50IHJldCA9IDA7CiAJaW50IGk7CiAK IAlpZiAoIWRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jaykKLQkJcmV0dXJuIDA7 CisJCXJldHVybjsKIAogCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNf c3RhdGUsIGkpIHsKKwkJaW50IGRwbGw7CisKIAkJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7CiAJCWludGVsX2NydGNfc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3Rh dGUpOworCQlkcGxsID0gaW50ZWxfY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAKLQkJaWYgKG5l ZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpIHsKLQkJCWNsZWFyX3BpcGVzIHw9IDEgPDwgaW50ZWxf Y3J0Yy0+cGlwZTsKLQkJCWludGVsX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsID0gRFBMTF9JRF9Q UklWQVRFOwotCQl9Ci0JfQotCi0JaWYgKGNsZWFyX3BpcGVzKSB7Ci0JCXN0cnVjdCBpbnRlbF9z aGFyZWRfZHBsbF9jb25maWcgKnNoYXJlZF9kcGxsID0KLQkJCWludGVsX2F0b21pY19nZXRfc2hh cmVkX2RwbGxfc3RhdGUoc3RhdGUpOwotCi0JCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVt X3NoYXJlZF9kcGxsOyBpKyspCi0JCQlzaGFyZWRfZHBsbFtpXS5jcnRjX21hc2sgJj0gfmNsZWFy X3BpcGVzOwotCX0KLQotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNf c3RhdGUsIGkpIHsKLQkJaWYgKCFuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpIHx8ICFjcnRjX3N0 YXRlLT5lbmFibGUpCisJCWlmICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSB8fCBkcGxsID09 IERQTExfSURfUFJJVkFURSkKIAkJCWNvbnRpbnVlOwogCi0JCWludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwotCQlpbnRlbF9jcnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShj cnRjX3N0YXRlKTsKKwkJaW50ZWxfY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGwgPSBEUExMX0lEX1BS SVZBVEU7CiAKLQkJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrKGlu dGVsX2NydGMsCi0JCQkJCQkJICAgaW50ZWxfY3J0Y19zdGF0ZSk7Ci0JCWlmIChyZXQpCi0JCQly ZXR1cm4gcmV0OwotCX0KKwkJaWYgKCFzaGFyZWRfZHBsbCkKKwkJCXNoYXJlZF9kcGxsID0gaW50 ZWxfYXRvbWljX2dldF9zaGFyZWRfZHBsbF9zdGF0ZShzdGF0ZSk7CiAKLQlyZXR1cm4gcmV0Owor CQlzaGFyZWRfZHBsbFtkcGxsXS5jcnRjX21hc2sgJj0gfigxIDw8IGludGVsX2NydGMtPnBpcGUp OworCX0KIH0KIAogLyoKQEAgLTEyNjI2LDE0ICsxMjYyMCwxMiBAQCBzdGF0aWMgaW50IGludGVs X21vZGVzZXRfY2hlY2tzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCXJldHVy biByZXQ7CiAJfQogCi0JcmV0ID0gaW50ZWxfbW9kZXNldF9zZXR1cF9wbGxzKHN0YXRlKTsKLQlp ZiAocmV0KQotCQlyZXR1cm4gcmV0OworCWludGVsX21vZGVzZXRfY2xlYXJfcGxscyhzdGF0ZSk7 CiAKIAlpZiAoSVNfSEFTV0VMTChkZXYpKQotCQlyZXQgPSBoYXN3ZWxsX21vZGVfc2V0X3BsYW5l c193b3JrYXJvdW5kKHN0YXRlKTsKKwkJcmV0dXJuIGhhc3dlbGxfbW9kZV9zZXRfcGxhbmVzX3dv cmthcm91bmQoc3RhdGUpOwogCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGlj IGludAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==