From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [RFC PATCH] drm/i915: Consider SPLL as another shared pll. Date: Wed, 16 Sep 2015 09:23:59 +0200 Message-ID: <55F9190F.7020101@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id F15156E088 for ; Wed, 16 Sep 2015 00:24:03 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Emil Renner Berthing List-Id: intel-gfx@lists.freedesktop.org V2hlbiBkaWFnbm9zaW5nIGEgdW5yZWxhdGVkIGJ1ZyBmb3Igc29tZW9uZSBvbiBpcmMsIGl0IHdv dWxkIHNlZW0gdGhlIGhhcmR3YXJlIGNhbgpiZSBicm91Z2h0IHVwIGJ5IHRoZSBCSU9TIHdpdGgg dGhlIGVtYmVkZGVkIGRpc3BsYXlwb3J0IHVzaW5nIHRoZSBTUExMIGZvciBzcHJlYWQgc3BlY3Ry dW0uCgpSaWdodCBub3cgdGhpcyBpcyBub3QgaGFuZGxlZCB3ZWxsIGluIGk5MTUsIGFuZCBpdCBj YWxjdWxhdGVzIHRoZSBjcnRjIG5lZWRzIHRvCmJlIHJlcHJvZ3JhbW1lZCBvbiB0aGUgZmlyc3Qg bW9kZXNldCB3aXRob3V0IFNTQywgYnV0ICB0aGUgU1BMTCBpdHNlbGYgd2FzIGtlcHQKYWN0aXZl LiBGaXggdGhpcyBieSBleHBvc2luZyBTUExMIGFzIGEgc2hhcmVkIHBsbCB0aGF0IHdpbGwgbm90 IGJlIHJldHVybmVkCmJ5IGludGVsX2dldF9zaGFyZWRfZHBsbDsgeW91IGhhdmUgdG8ga25vdyBp dCBleGlzdHMgdG8gdXNlIGl0LiA7LSkKCkNjOiBFbWlsIFJlbm5lciBCZXJ0aGluZyA8a2VybmVs QGVzbWlsLmRrPgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5r aG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KUkZDIGJlY2F1c2UgSSBoYXZlbid0IHRlc3RlZCBp dCB3aXRoIFZHQSwgYnV0IGl0IHNlZW1zIHRvIHdvcmsgYWNjb3JkaW5nIHRvIGZpeAp0aGUgcHJv YmxlbSBtZW50aW9uZWQgYWJvdmUuCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggODFhZGY4 OWI5MmYxLi5jYWNkYWM2N2Q5YmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzQ1LDYg KzM0NSw4IEBAIGVudW0gaW50ZWxfZHBsbF9pZCB7CiAJLyogaHN3L2JkdyAqLwogCURQTExfSURf V1JQTEwxID0gMCwKIAlEUExMX0lEX1dSUExMMiA9IDEsCisJRFBMTF9JRF9TUExMID0gMiwKKwog CS8qIHNrbCAqLwogCURQTExfSURfU0tMX0RQTEwxID0gMCwKIAlEUExMX0lEX1NLTF9EUExMMiA9 IDEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCmluZGV4IGFmNWU0M2JlZjRhNC4uNTkyZDhmZTlm OTkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwpAQCAtMTM4LDE4ICsxMzgsNiBAQCBzdGF0 aWMgdm9pZCBoc3dfY3J0X2dldF9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIs CiAJcGlwZV9jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5mbGFncyB8PSBpbnRlbF9jcnRfZ2V0 X2ZsYWdzKGVuY29kZXIpOwogfQogCi1zdGF0aWMgdm9pZCBoc3dfY3J0X3ByZV9lbmFibGUoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGVuY29kZXItPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlXQVJOKEk5MTVfUkVBRChTUExMX0NUTCkgJiBTUExMX1BM TF9FTkFCTEUsICJTUExMIGFscmVhZHkgZW5hYmxlZFxuIik7Ci0JSTkxNV9XUklURShTUExMX0NU TCwKLQkJICAgU1BMTF9QTExfRU5BQkxFIHwgU1BMTF9QTExfRlJFUV8xMzUwTUh6IHwgU1BMTF9Q TExfU1NDKTsKLQlQT1NUSU5HX1JFQUQoU1BMTF9DVEwpOwotCXVkZWxheSgyMCk7Ci19Ci0KIC8q IE5vdGU6IFRoZSBjYWxsZXIgaXMgcmVxdWlyZWQgdG8gZmlsdGVyIG91dCBkcG1zIG1vZGVzIG5v dCBzdXBwb3J0ZWQgYnkgdGhlCiAgKiBwbGF0Zm9ybS4gKi8KIHN0YXRpYyB2b2lkIGludGVsX2Ny dF9zZXRfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgaW50IG1vZGUpCkBAIC0y MTYsMTkgKzIwNCw2IEBAIHN0YXRpYyB2b2lkIHBjaF9wb3N0X2Rpc2FibGVfY3J0KHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyKQogCWludGVsX2Rpc2FibGVfY3J0KGVuY29kZXIpOwogfQog Ci1zdGF0aWMgdm9pZCBoc3dfY3J0X3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlcikKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK LQl1aW50MzJfdCB2YWw7Ci0KLQlEUk1fREVCVUdfS01TKCJEaXNhYmxpbmcgU1BMTFxuIik7Ci0J dmFsID0gSTkxNV9SRUFEKFNQTExfQ1RMKTsKLQlXQVJOX09OKCEodmFsICYgU1BMTF9QTExfRU5B QkxFKSk7Ci0JSTkxNV9XUklURShTUExMX0NUTCwgdmFsICYgflNQTExfUExMX0VOQUJMRSk7Ci0J UE9TVElOR19SRUFEKFNQTExfQ1RMKTsKLX0KLQogc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2Ny dChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0ICpj cnQgPSBpbnRlbF9lbmNvZGVyX3RvX2NydChlbmNvZGVyKTsKQEAgLTI4MCw2ICsyNTUsOCBAQCBz dGF0aWMgYm9vbCBpbnRlbF9jcnRfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCiAJaWYgKEhBU19EREkoZGV2KSkgewogCQlwaXBlX2NvbmZpZy0+ZGRpX3BsbF9z ZWwgPSBQT1JUX0NMS19TRUxfU1BMTDsKIAkJcGlwZV9jb25maWctPnBvcnRfY2xvY2sgPSAxMzUw MDAgKiAyOworCQlwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS53cnBsbCA9CisJCQlTUExMX1BM TF9FTkFCTEUgfCBTUExMX1BMTF9GUkVRXzEzNTBNSHogfCBTUExMX1BMTF9TU0M7CiAJfQogCiAJ cmV0dXJuIHRydWU7CkBAIC04NjEsOCArODM4LDYgQEAgdm9pZCBpbnRlbF9jcnRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChIQVNfRERJKGRldikpIHsKIAkJY3J0LT5iYXNlLmdl dF9jb25maWcgPSBoc3dfY3J0X2dldF9jb25maWc7CiAJCWNydC0+YmFzZS5nZXRfaHdfc3RhdGUg PSBpbnRlbF9kZGlfZ2V0X2h3X3N0YXRlOwotCQljcnQtPmJhc2UucHJlX2VuYWJsZSA9IGhzd19j cnRfcHJlX2VuYWJsZTsKLQkJY3J0LT5iYXNlLnBvc3RfZGlzYWJsZSA9IGhzd19jcnRfcG9zdF9k aXNhYmxlOwogCX0gZWxzZSB7CiAJCWNydC0+YmFzZS5nZXRfY29uZmlnID0gaW50ZWxfY3J0X2dl dF9jb25maWc7CiAJCWNydC0+YmFzZS5nZXRfaHdfc3RhdGUgPSBpbnRlbF9jcnRfZ2V0X2h3X3N0 YXRlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCA2MTU3NWY2N2E2MjYuLmRhYmQ5MDMx NDdmYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTEyNjksNiArMTI2OSwxOCBAQCBo c3dfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJCX0KIAog CQljcnRjX3N0YXRlLT5kZGlfcGxsX3NlbCA9IFBPUlRfQ0xLX1NFTF9XUlBMTChwbGwtPmlkKTsK Kwl9IGVsc2UgaWYgKGNydGNfc3RhdGUtPmRkaV9wbGxfc2VsID09IFBPUlRfQ0xLX1NFTF9TUExM KSB7CisJCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNydGNfc3RhdGUtPmJhc2Uu c3RhdGU7CisJCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnNwbGwgPQorCQkJJmlu dGVsX2F0b21pY19nZXRfc2hhcmVkX2RwbGxfc3RhdGUoc3RhdGUpW0RQTExfSURfU1BMTF07CisK KwkJaWYgKHNwbGwtPmNydGNfbWFzayAmJgorCQkgICAgV0FSTl9PTihzcGxsLT5od19zdGF0ZS53 cnBsbCAhPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLndycGxsKSkKKwkJCXJldHVybiBmYWxz ZTsKKworCQljcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9IERQTExfSURfU1BMTDsKKwkJc3BsbC0+ aHdfc3RhdGUud3JwbGwgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLndycGxsOworCQlzcGxs LT5jcnRjX21hc2sgfD0gMSA8PCBpbnRlbF9jcnRjLT5waXBlOwogCX0KIAogCXJldHVybiB0cnVl OwpAQCAtMjQxNCwxOSArMjQyNiwzMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX2RkaShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKIHN0YXRpYyB2b2lkIGhzd19kZGlf cGxsX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICAg c3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwpCiB7Ci0JSTkxNV9XUklURShXUlBMTF9DVEwo cGxsLT5pZCksIHBsbC0+Y29uZmlnLmh3X3N0YXRlLndycGxsKTsKLQlQT1NUSU5HX1JFQUQoV1JQ TExfQ1RMKHBsbC0+aWQpKTsKKwl1aW50MzJfdCByZWc7CisKKwlpZiAocGxsLT5pZCA9PSBEUExM X0lEX1NQTEwpCisJCXJlZyA9IFNQTExfQ1RMOworCWVsc2UKKwkJcmVnID0gV1JQTExfQ1RMKHBs bC0+aWQpOworCisJSTkxNV9XUklURShyZWcsIHBsbC0+Y29uZmlnLmh3X3N0YXRlLndycGxsKTsK KwlQT1NUSU5HX1JFQUQocmVnKTsKIAl1ZGVsYXkoMjApOwogfQogCiBzdGF0aWMgdm9pZCBoc3df ZGRpX3BsbF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQlz dHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCkKIHsKLQl1aW50MzJfdCB2YWw7CisJdWludDMy X3QgcmVnLCB2YWw7CiAKLQl2YWwgPSBJOTE1X1JFQUQoV1JQTExfQ1RMKHBsbC0+aWQpKTsKLQlJ OTE1X1dSSVRFKFdSUExMX0NUTChwbGwtPmlkKSwgdmFsICYgfldSUExMX1BMTF9FTkFCTEUpOwot CVBPU1RJTkdfUkVBRChXUlBMTF9DVEwocGxsLT5pZCkpOworCWlmIChwbGwtPmlkID09IERQTExf SURfU1BMTCkKKwkJcmVnID0gU1BMTF9DVEw7CisJZWxzZQorCQlyZWcgPSBXUlBMTF9DVEwocGxs LT5pZCk7CisKKwl2YWwgPSBJOTE1X1JFQUQocmVnKTsKKwlJOTE1X1dSSVRFKHJlZywgdmFsICYg fldSUExMX1BMTF9FTkFCTEUpOworCVBPU1RJTkdfUkVBRChyZWcpOwogfQogCiBzdGF0aWMgYm9v bCBoc3dfZGRpX3BsbF9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LApAQCAtMjQzOCwyMyArMjQ2MiwyOCBAQCBzdGF0aWMgYm9vbCBoc3dfZGRpX3BsbF9nZXRf aHdfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmICghaW50ZWxf ZGlzcGxheV9wb3dlcl9pc19lbmFibGVkKGRldl9wcml2LCBQT1dFUl9ET01BSU5fUExMUykpCiAJ CXJldHVybiBmYWxzZTsKIAotCXZhbCA9IEk5MTVfUkVBRChXUlBMTF9DVEwocGxsLT5pZCkpOwot CWh3X3N0YXRlLT53cnBsbCA9IHZhbDsKKwlpZiAocGxsLT5pZCA9PSBEUExMX0lEX1NQTEwpCisJ CXZhbCA9IEk5MTVfUkVBRChTUExMX0NUTCk7CisJZWxzZQorCQl2YWwgPSBJOTE1X1JFQUQoV1JQ TExfQ1RMKHBsbC0+aWQpKTsKIAorCWh3X3N0YXRlLT53cnBsbCA9IHZhbDsKIAlyZXR1cm4gdmFs ICYgV1JQTExfUExMX0VOQUJMRTsKIH0KIAogc3RhdGljIGNvbnN0IGNoYXIgKiBjb25zdCBoc3df ZGRpX3BsbF9uYW1lc1tdID0gewogCSJXUlBMTCAxIiwKIAkiV1JQTEwgMiIsCisJIlNQTEwiCiB9 OwogCiBzdGF0aWMgdm9pZCBoc3dfc2hhcmVkX2RwbGxzX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewogCWludCBpOwogCi0JZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBs bCA9IDI7CisJZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbCA9IDM7CiAKKwkvKiBTUExMIGlzIHNw ZWNpYWwsIGJ1dCBuZWVkcyB0byBiZSBpbml0aWFsaXplZCBhbnl3YXkuLiAqLwogCWZvciAoaSA9 IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsOyBpKyspIHsKIAkJZGV2X3ByaXYtPnNo YXJlZF9kcGxsc1tpXS5pZCA9IGk7CiAJCWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0ubmFtZSA9 IGhzd19kZGlfcGxsX25hbWVzW2ldOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IGNhOTI3OGJlNDlmNy4uNTgyMzYwZDJmYTA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCkBAIC00MjA4LDYgKzQyMDgsNyBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwg KmludGVsX2dldF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlzdHJ1Y3Qg aW50ZWxfc2hhcmVkX2RwbGwgKnBsbDsKIAlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmln ICpzaGFyZWRfZHBsbDsKIAllbnVtIGludGVsX2RwbGxfaWQgaTsKKwlpbnQgbWF4ID0gZGV2X3By aXYtPm51bV9zaGFyZWRfZHBsbDsKIAogCXNoYXJlZF9kcGxsID0gaW50ZWxfYXRvbWljX2dldF9z aGFyZWRfZHBsbF9zdGF0ZShjcnRjX3N0YXRlLT5iYXNlLnN0YXRlKTsKIApAQCAtNDI0Miw5ICs0 MjQzLDExIEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxs KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQlXQVJOX09OKHNoYXJlZF9kcGxsW2ldLmNydGNf bWFzayk7CiAKIAkJZ290byBmb3VuZDsKLQl9CisJfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldl9w cml2KS0+Z2VuIDwgOSAmJiBIQVNfRERJKGRldl9wcml2KSkKKwkJLyogRG8gbm90IGNvbnNpZGVy IFNQTEwgKi8KKwkJbWF4ID0gMjsKIAotCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3No YXJlZF9kcGxsOyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgbWF4OyBpKyspIHsKIAkJcGxsID0g JmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CiAKIAkJLyogT25seSB3YW50IHRvIGNoZWNrIGVu YWJsZWQgdGltaW5ncyBmaXJzdCAqLwpAQCAtOTY5Niw2ICs5Njk5LDggQEAgc3RhdGljIHZvaWQg aGFzd2VsbF9nZXRfZGRpX3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ Y2FzZSBQT1JUX0NMS19TRUxfV1JQTEwyOgogCQlwaXBlX2NvbmZpZy0+c2hhcmVkX2RwbGwgPSBE UExMX0lEX1dSUExMMjsKIAkJYnJlYWs7CisJY2FzZSBQT1JUX0NMS19TRUxfU1BMTDoKKwkJcGlw ZV9jb25maWctPnNoYXJlZF9kcGxsID0gRFBMTF9JRF9TUExMOwogCX0KIH0KIAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK