From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 01/14] drm/i915: Make {vlv, chv}_{disable, update}_pll() more similar Date: Thu, 3 Sep 2015 21:50:03 +0300 Message-ID: <1441306216-6581-2-git-send-email-ville.syrjala@linux.intel.com> References: <1441306216-6581-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A26A6EB39 for ; Thu, 3 Sep 2015 11:50:22 -0700 (PDT) In-Reply-To: <1441306216-6581-1-git-send-email-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBWTFYgYW5kIENIViBEUExMIGRpc2FibGUgYW5kIHVwZGF0ZSBhcmUgYWxtb3N0IGlkZW50aWNh bCBpbgpob3cgdGhlIERQTEwvRFBMTF9NRCByZWdpc3RlcnMgbmVlZCB0byBiZSBzZXQgdXAuIEJ1 dCB0aGUgY29kZQpsb29rcyBtb3JlIGRpZmZlcmVudCB0aGFuIGl0IHJlYWxseSBpcy4gVHJ5IHRv IGJyaW5nIHRoZW0gaW50bwpsaW5lLgoKdjI6IHMvY2h2X3VwZGF0ZV9wbGwvY2h2X2NvbXB1dGVf ZHBsbC8KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg NjMgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjUgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IDAzNzc1MjAuLmQzMWIxMDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTE3NjEsMTYgKzE3NjEsMTMgQEAgc3RhdGljIHZvaWQgdmx2X2Rpc2Fi bGVfcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUp CiAJLyogTWFrZSBzdXJlIHRoZSBwaXBlIGlzbid0IHN0aWxsIHJlbHlpbmcgb24gdXMgKi8KIAlh c3NlcnRfcGlwZV9kaXNhYmxlZChkZXZfcHJpdiwgcGlwZSk7CiAKLQkvKgotCSAqIExlYXZlIGlu dGVncmF0ZWQgY2xvY2sgc291cmNlIGFuZCByZWZlcmVuY2UgY2xvY2sgZW5hYmxlZCBmb3IgcGlw ZSBCLgotCSAqIFRoZSBsYXR0ZXIgaXMgbmVlZGVkIGZvciBWR0EgaG90cGx1ZyAvIG1hbnVhbCBk ZXRlY3Rpb24uCi0JICovCi0JdmFsID0gRFBMTF9WR0FfTU9ERV9ESVM7Ci0JaWYgKHBpcGUgPT0g UElQRV9CKQotCQl2YWwgPSBEUExMX0lOVEVHUkFURURfQ1JJX0NMS19WTFYgfCBEUExMX1JFRl9D TEtfRU5BQkxFX1ZMVjsKKwl2YWwgPSBEUExMX0lOVEVHUkFURURfUkVGX0NMS19WTFYgfAorCQlE UExMX1JFRl9DTEtfRU5BQkxFX1ZMViB8IERQTExfVkdBX01PREVfRElTOworCWlmIChwaXBlICE9 IFBJUEVfQSkKKwkJdmFsIHw9IERQTExfSU5URUdSQVRFRF9DUklfQ0xLX1ZMVjsKKwogCUk5MTVf V1JJVEUoRFBMTChwaXBlKSwgdmFsKTsKIAlQT1NUSU5HX1JFQUQoRFBMTChwaXBlKSk7Ci0KIH0K IAogc3RhdGljIHZvaWQgY2h2X2Rpc2FibGVfcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCkBAIC0xNzgxLDExICsxNzc4LDExIEBAIHN0YXRpYyB2 b2lkIGNodl9kaXNhYmxlX3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVu dW0gcGlwZSBwaXBlKQogCS8qIE1ha2Ugc3VyZSB0aGUgcGlwZSBpc24ndCBzdGlsbCByZWx5aW5n IG9uIHVzICovCiAJYXNzZXJ0X3BpcGVfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUpOwogCi0JLyog U2V0IFBMTCBlbiA9IDAgKi8KIAl2YWwgPSBEUExMX1NTQ19SRUZfQ0xLX0NIViB8CiAJCURQTExf UkVGX0NMS19FTkFCTEVfVkxWIHwgRFBMTF9WR0FfTU9ERV9ESVM7CiAJaWYgKHBpcGUgIT0gUElQ RV9BKQogCQl2YWwgfD0gRFBMTF9JTlRFR1JBVEVEX0NSSV9DTEtfVkxWOworCiAJSTkxNV9XUklU RShEUExMKHBpcGUpLCB2YWwpOwogCVBPU1RJTkdfUkVBRChEUExMKHBpcGUpKTsKIApAQCAtNzE3 OCwyNCArNzE3NSwyNyBAQCB2b2lkIGludGVsX2RwX3NldF9tX24oc3RydWN0IGludGVsX2NydGMg KmNydGMsIGVudW0gbGlua19tX25fc2V0IG1fbikKIHN0YXRpYyB2b2lkIHZsdl9jb21wdXRlX2Rw bGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZykKIHsKLQl1MzIgZHBsbCwgZHBsbF9tZDsKKwlwaXBlX2NvbmZpZy0+ ZHBsbF9od19zdGF0ZS5kcGxsID0gRFBMTF9JTlRFR1JBVEVEX1JFRl9DTEtfVkxWIHwKKwkJRFBM TF9SRUZfQ0xLX0VOQUJMRV9WTFYgfCBEUExMX1ZHQV9NT0RFX0RJUyB8CisJCURQTExfVkNPX0VO QUJMRSB8IERQTExfRVhUX0JVRkZFUl9FTkFCTEVfVkxWOworCWlmIChjcnRjLT5waXBlICE9IFBJ UEVfQSkKKwkJcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuZHBsbCB8PSBEUExMX0lOVEVHUkFU RURfQ1JJX0NMS19WTFY7CiAKLQkvKgotCSAqIEVuYWJsZSBEUElPIGNsb2NrIGlucHV0LiBXZSBz aG91bGQgbmV2ZXIgZGlzYWJsZSB0aGUgcmVmZXJlbmNlCi0JICogY2xvY2sgZm9yIHBpcGUgQiwg c2luY2UgVkdBIGhvdHBsdWcgLyBtYW51YWwgZGV0ZWN0aW9uIGRlcGVuZHMKLQkgKiBvbiBpdC4K LQkgKi8KLQlkcGxsID0gRFBMTF9FWFRfQlVGRkVSX0VOQUJMRV9WTFYgfCBEUExMX1JFRl9DTEtf RU5BQkxFX1ZMViB8Ci0JCURQTExfVkdBX01PREVfRElTIHwgRFBMTF9JTlRFR1JBVEVEX1JFRl9D TEtfVkxWOwotCS8qIFdlIHNob3VsZCBuZXZlciBkaXNhYmxlIHRoaXMsIHNldCBpdCBoZXJlIGZv ciBzdGF0ZSB0cmFja2luZyAqLwotCWlmIChjcnRjLT5waXBlID09IFBJUEVfQikKLQkJZHBsbCB8 PSBEUExMX0lOVEVHUkFURURfQ1JJX0NMS19WTFY7Ci0JZHBsbCB8PSBEUExMX1ZDT19FTkFCTEU7 Ci0JcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuZHBsbCA9IGRwbGw7CisJcGlwZV9jb25maWct PmRwbGxfaHdfc3RhdGUuZHBsbF9tZCA9CisJCShwaXBlX2NvbmZpZy0+cGl4ZWxfbXVsdGlwbGll ciAtIDEpIDw8IERQTExfTURfVURJX01VTFRJUExJRVJfU0hJRlQ7Cit9CisKK3N0YXRpYyB2b2lk IGNodl9jb21wdXRlX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgIHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKK3sKKwlwaXBlX2NvbmZpZy0+ZHBsbF9o d19zdGF0ZS5kcGxsID0gRFBMTF9TU0NfUkVGX0NMS19DSFYgfAorCQlEUExMX1JFRl9DTEtfRU5B QkxFX1ZMViB8IERQTExfVkdBX01PREVfRElTIHwKKwkJRFBMTF9WQ09fRU5BQkxFOworCWlmIChj cnRjLT5waXBlICE9IFBJUEVfQSkKKwkJcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuZHBsbCB8 PSBEUExMX0lOVEVHUkFURURfQ1JJX0NMS19WTFY7CiAKLQlkcGxsX21kID0gKHBpcGVfY29uZmln LT5waXhlbF9tdWx0aXBsaWVyIC0gMSkKLQkJPDwgRFBMTF9NRF9VRElfTVVMVElQTElFUl9TSElG VDsKLQlwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5kcGxsX21kID0gZHBsbF9tZDsKKwlwaXBl X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5kcGxsX21kID0KKwkJKHBpcGVfY29uZmlnLT5waXhlbF9t dWx0aXBsaWVyIC0gMSkgPDwgRFBMTF9NRF9VRElfTVVMVElQTElFUl9TSElGVDsKIH0KIAogc3Rh dGljIHZvaWQgdmx2X3ByZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLApAQCAtNzI4 OSwxOSArNzI4OSw2IEBAIHN0YXRpYyB2b2lkIHZsdl9wcmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKIH0KIAotc3Rh dGljIHZvaWQgY2h2X2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKLQkJCSAg ICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQotewotCXBpcGVfY29uZmln LT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBEUExMX1NTQ19SRUZfQ0xLX0NIViB8Ci0JCURQTExfUkVG X0NMS19FTkFCTEVfVkxWIHwgRFBMTF9WR0FfTU9ERV9ESVMgfAotCQlEUExMX1ZDT19FTkFCTEU7 Ci0JaWYgKGNydGMtPnBpcGUgIT0gUElQRV9BKQotCQlwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0 ZS5kcGxsIHw9IERQTExfSU5URUdSQVRFRF9DUklfQ0xLX1ZMVjsKLQotCXBpcGVfY29uZmlnLT5k cGxsX2h3X3N0YXRlLmRwbGxfbWQgPQotCQkocGlwZV9jb25maWctPnBpeGVsX211bHRpcGxpZXIg LSAxKSA8PCBEUExMX01EX1VESV9NVUxUSVBMSUVSX1NISUZUOwotfQotCiBzdGF0aWMgdm9pZCBj aHZfcHJlcGFyZV9wbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewotLSAKMi40LjYKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==