From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 05/19] drm/i915: Assign a new pll from the crtc check function, v2. Date: Mon, 15 Jun 2015 12:33:42 +0200 Message-ID: <1434364436-6366-6-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434364436-6366-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 52C2B6E730 for ; Mon, 15 Jun 2015 03:34:14 -0700 (PDT) In-Reply-To: <1434364436-6366-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 SXQgc2F2ZXMgYW5vdGhlciBsb29wIG92ZXIgYWxsIGNydGMncyBpbiB0aGUgc3RhdGUsIGFuZCBj b21wdXRpbmcKY2xvY2sgaXMgbW9yZSBvZiBhIHBlciBjcnRjIHRoaW5nLgoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2MCArKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25z KCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggZTY4MzcxNzJhZmFmLi4wZjc2NTJhMzFjOTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTExNzA3LDExICsxMTcwNywxMiBAQCBzdGF0aWMgaW50IGludGVsX2NydGNf YXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICBzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt PmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQogCQl0b19pbnRlbF9j cnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9 IGNydGNfc3RhdGUtPnN0YXRlOwotCWludCBpZHggPSBjcnRjLT5iYXNlLmlkOworCWludCByZXQs IGlkeCA9IGNydGMtPmJhc2UuaWQ7CiAJYm9vbCBtb2RlX2NoYW5nZWQgPSBuZWVkc19tb2Rlc2V0 KGNydGNfc3RhdGUpOwogCiAJaWYgKG1vZGVfY2hhbmdlZCAmJiAhY2hlY2tfZW5jb2Rlcl9jbG9u aW5nKHN0YXRlLCBpbnRlbF9jcnRjKSkgewpAQCAtMTE3MjMsNiArMTE3MjQsMTUgQEAgc3RhdGlj IGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCSJb Q1JUQzolaV0gbWlzbWF0Y2ggYmV0d2VlbiBzdGF0ZS0+YWN0aXZlKCVpKSBhbmQgY3J0Yy0+YWN0 aXZlKCVpKVxuIiwKIAkJaWR4LCBjcnRjLT5zdGF0ZS0+YWN0aXZlLCBpbnRlbF9jcnRjLT5hY3Rp dmUpOwogCisJaWYgKG1vZGVfY2hhbmdlZCAmJiBjcnRjX3N0YXRlLT5lbmFibGUgJiYKKwkgICAg ZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrICYmCisJICAgICFXQVJOX09OKHBp cGVfY29uZmlnLT5zaGFyZWRfZHBsbCAhPSBEUExMX0lEX1BSSVZBVEUpKSB7CisJCXJldCA9IGRl dl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayhpbnRlbF9jcnRjLAorCQkJCQkJCSAg IHBpcGVfY29uZmlnKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQorCiAJcmV0dXJu IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKGRldiwgaW50ZWxfY3J0YywgcGlwZV9jb25maWcp OwogfQogCkBAIC0xMjc3Nyw1MyArMTI3ODcsMzcgQEAgc3RhdGljIHZvaWQgdXBkYXRlX3NjYW5s aW5lX29mZnNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJY3J0Yy0+c2NhbmxpbmVfb2Zm c2V0ID0gMTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9tb2Rlc2V0X3NldHVwX3BsbHMoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQorc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9jbGVh cl9wbGxzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Ci0JdW5zaWduZWQgY2xlYXJfcGlwZXMgPSAwOworCXN0cnVjdCBp bnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnNoYXJlZF9kcGxsID0gTlVMTDsKIAlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3J0 Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlOwotCWludCByZXQgPSAwOwogCWludCBpOwogCiAJaWYgKCFkZXZfcHJpdi0+ ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2spCi0JCXJldHVybiAwOworCQlyZXR1cm47CiAKIAlm b3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJCWlu dCBkcGxsOworCiAJCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCQlpbnRlbF9j cnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKKwkJZHBsbCA9IGlu dGVsX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCi0JCWlmIChuZWVkc19tb2Rlc2V0KGNydGNf c3RhdGUpKSB7Ci0JCQljbGVhcl9waXBlcyB8PSAxIDw8IGludGVsX2NydGMtPnBpcGU7Ci0JCQlp bnRlbF9jcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9IERQTExfSURfUFJJVkFURTsKLQkJfQotCX0K LQotCWlmIChjbGVhcl9waXBlcykgewotCQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmln ICpzaGFyZWRfZHBsbCA9Ci0JCQlpbnRlbF9hdG9taWNfZ2V0X3NoYXJlZF9kcGxsX3N0YXRlKHN0 YXRlKTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsr KQotCQkJc2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrICY9IH5jbGVhcl9waXBlczsKLQl9Ci0KLQlm b3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0JCWlm ICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSB8fCAhY3J0Y19zdGF0ZS0+ZW5hYmxlKQorCQlp ZiAoIW5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkgfHwgZHBsbCA9PSBEUExMX0lEX1BSSVZBVEUp CiAJCQljb250aW51ZTsKIAotCQlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQkJ aW50ZWxfY3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSk7CisJCWlu dGVsX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsID0gRFBMTF9JRF9QUklWQVRFOwogCi0JCXJldCA9 IGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayhpbnRlbF9jcnRjLAotCQkJCQkJ CSAgIGludGVsX2NydGNfc3RhdGUpOwotCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKLQl9CisJ CWlmICghc2hhcmVkX2RwbGwpCisJCQlzaGFyZWRfZHBsbCA9IGludGVsX2F0b21pY19nZXRfc2hh cmVkX2RwbGxfc3RhdGUoc3RhdGUpOwogCi0JcmV0dXJuIHJldDsKKwkJc2hhcmVkX2RwbGxbZHBs bF0uY3J0Y19tYXNrICY9IH4oMSA8PCBpbnRlbF9jcnRjLT5waXBlKTsKKwl9CiB9CiAKIC8qCkBA IC0xMjkxOSwxNCArMTI5MTMsMTIgQEAgc3RhdGljIGludCBpbnRlbF9tb2Rlc2V0X2NoZWNrcyhz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCQlyZXR1cm4gcmV0OwogCX0KIAotCXJl dCA9IGludGVsX21vZGVzZXRfc2V0dXBfcGxscyhzdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJu IHJldDsKKwlpbnRlbF9tb2Rlc2V0X2NsZWFyX3BsbHMoc3RhdGUpOwogCiAJaWYgKElTX0hBU1dF TEwoZGV2KSkKLQkJcmV0ID0gaGFzd2VsbF9tb2RlX3NldF9wbGFuZXNfd29ya2Fyb3VuZChzdGF0 ZSk7CisJCXJldHVybiBoYXN3ZWxsX21vZGVfc2V0X3BsYW5lc193b3JrYXJvdW5kKHN0YXRlKTsK IAotCXJldHVybiByZXQ7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQKLS0gCjIuMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=