From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 09/27] drm/i915: Assign a new pll from the crtc check function. Date: Thu, 4 Jun 2015 14:47:39 +0200 Message-ID: <1433422077-14907-10-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433422077-14907-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 517CF6EAFA for ; Thu, 4 Jun 2015 05:48:12 -0700 (PDT) In-Reply-To: <1433422077-14907-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 aXNwbGF5LmMKaW5kZXggNDFlMGY1MGIzZWFlLi41Y2U3OGZlYzI1NzUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExNDcyLDExICsxMTQ3MiwxMiBAQCBzdGF0aWMgaW50 IGludGVsX2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQog CQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSA9IGNydGNfc3RhdGUtPnN0YXRlOwotCWludCBpZHggPSBjcnRjLT5iYXNlLmlk OworCWludCByZXQsIGlkeCA9IGNydGMtPmJhc2UuaWQ7CiAJYm9vbCBtb2RlX2NoYW5nZWQgPSBu ZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpOwogCiAJaWYgKG1vZGVfY2hhbmdlZCAmJiAhY2hlY2tf ZW5jb2Rlcl9jbG9uaW5nKHN0YXRlLCBpbnRlbF9jcnRjKSkgewpAQCAtMTE0ODgsNiArMTE0ODks MTUgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJCSJbQ1JUQzolaV0gbWlzbWF0Y2ggYmV0d2VlbiBzdGF0ZS0+YWN0aXZlKCVpKSBh bmQgY3J0Yy0+YWN0aXZlKCVpKVxuIiwKIAkJaWR4LCBjcnRjLT5zdGF0ZS0+YWN0aXZlLCBpbnRl bF9jcnRjLT5hY3RpdmUpOwogCisJaWYgKG1vZGVfY2hhbmdlZCAmJiBjcnRjX3N0YXRlLT5lbmFi bGUgJiYKKwkgICAgZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrICYmCisJICAg ICFXQVJOX09OKHBpcGVfY29uZmlnLT5zaGFyZWRfZHBsbCAhPSBEUExMX0lEX1BSSVZBVEUpKSB7 CisJCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayhpbnRlbF9jcnRj LAorCQkJCQkJCSAgIHBpcGVfY29uZmlnKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJ fQorCiAJcmV0dXJuIGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKGRldiwgaW50ZWxfY3J0Yywg cGlwZV9jb25maWcpOwogfQogCkBAIC0xMjUwNSw1MyArMTI1MTUsMzcgQEAgc3RhdGljIHZvaWQg dXBkYXRlX3NjYW5saW5lX29mZnNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJY3J0Yy0+ c2NhbmxpbmVfb2Zmc2V0ID0gMTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9tb2Rlc2V0X3NldHVw X3BsbHMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQorc3RhdGljIHZvaWQgaW50ZWxf bW9kZXNldF9jbGVhcl9wbGxzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JdW5zaWduZWQgY2xlYXJfcGlwZXMgPSAw OworCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnNoYXJlZF9kcGxsID0gTlVMTDsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqaW50ZWxfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRy bV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwotCWludCByZXQgPSAwOwogCWludCBpOwogCiAJaWYg KCFkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2spCi0JCXJldHVybiAwOworCQly ZXR1cm47CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRl LCBpKSB7CisJCWludCBkcGxsOworCiAJCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMp OwogCQlpbnRlbF9jcnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsK KwkJZHBsbCA9IGludGVsX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCi0JCWlmIChuZWVkc19t b2Rlc2V0KGNydGNfc3RhdGUpKSB7Ci0JCQljbGVhcl9waXBlcyB8PSAxIDw8IGludGVsX2NydGMt PnBpcGU7Ci0JCQlpbnRlbF9jcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9IERQTExfSURfUFJJVkFU RTsKLQkJfQotCX0KLQotCWlmIChjbGVhcl9waXBlcykgewotCQlzdHJ1Y3QgaW50ZWxfc2hhcmVk X2RwbGxfY29uZmlnICpzaGFyZWRfZHBsbCA9Ci0JCQlpbnRlbF9hdG9taWNfZ2V0X3NoYXJlZF9k cGxsX3N0YXRlKHN0YXRlKTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFy ZWRfZHBsbDsgaSsrKQotCQkJc2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrICY9IH5jbGVhcl9waXBl czsKLQl9Ci0KLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRl LCBpKSB7Ci0JCWlmICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSB8fCAhY3J0Y19zdGF0ZS0+ ZW5hYmxlKQorCQlpZiAoIW5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkgfHwgZHBsbCA9PSBEUExM X0lEX1BSSVZBVEUpCiAJCQljb250aW51ZTsKIAotCQlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKLQkJaW50ZWxfY3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19z dGF0ZSk7CisJCWludGVsX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsID0gRFBMTF9JRF9QUklWQVRF OwogCi0JCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayhpbnRlbF9j cnRjLAotCQkJCQkJCSAgIGludGVsX2NydGNfc3RhdGUpOwotCQlpZiAocmV0KQotCQkJcmV0dXJu IHJldDsKLQl9CisJCWlmICghc2hhcmVkX2RwbGwpCisJCQlzaGFyZWRfZHBsbCA9IGludGVsX2F0 b21pY19nZXRfc2hhcmVkX2RwbGxfc3RhdGUoc3RhdGUpOwogCi0JcmV0dXJuIHJldDsKKwkJc2hh cmVkX2RwbGxbZHBsbF0uY3J0Y19tYXNrICY9IH4oMSA8PCBpbnRlbF9jcnRjLT5waXBlKTsKKwl9 CiB9CiAKIC8qCkBAIC0xMjY0MywxNCArMTI2MzcsMTIgQEAgc3RhdGljIGludCBpbnRlbF9tb2Rl c2V0X2NoZWNrcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCQlyZXR1cm4gcmV0 OwogCX0KIAotCXJldCA9IGludGVsX21vZGVzZXRfc2V0dXBfcGxscyhzdGF0ZSk7Ci0JaWYgKHJl dCkKLQkJcmV0dXJuIHJldDsKKwlpbnRlbF9tb2Rlc2V0X2NsZWFyX3BsbHMoc3RhdGUpOwogCiAJ aWYgKElTX0hBU1dFTEwoZGV2KSkKLQkJcmV0ID0gaGFzd2VsbF9tb2RlX3NldF9wbGFuZXNfd29y a2Fyb3VuZChzdGF0ZSk7CisJCXJldHVybiBoYXN3ZWxsX21vZGVfc2V0X3BsYW5lc193b3JrYXJv dW5kKHN0YXRlKTsKIAotCXJldHVybiByZXQ7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQK LS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=