From: Imre Deak Subject: [PATCH 29/49] drm/i915: Rename vlv_cdclk_freq to cdclk_freq Date: Tue, 17 Mar 2015 11:39:55 +0200 Message-ID: <1426585215-8788-30-git-send-email-imre.deak@intel.com> References: <1426585215-8788-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1870D6E65C for ; Tue, 17 Mar 2015 02:40:46 -0700 (PDT) In-Reply-To: <1426585215-8788-1-git-send-email-imre.deak@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 RnJvbTogVmFuZGFuYSBLYW5uYW4gPHZhbmRhbmEua2FubmFuQGludGVsLmNvbT4KClJlbmFtZSB2 bHZfY2RjbGtfZnJlcSB0byBjZGNsa19mcmVxIHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgZm9yIGFs bApwbGF0Zm9ybXMgYXMgcmVxdWlyZWQuIE5lZWRlZCBieSB0aGUgbmV4dCBwYXRjaC4KClNpZ25l ZC1vZmYtYnk6IFZhbmRhbmEgS2FubmFuIDx2YW5kYW5hLmthbm5hbkBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IEEuU3VuaWwgS2FtYXRoIDxzdW5pbC5rYW1hdGhAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDE4ICsrKysrKysrKystLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAx MSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDUyZTVmMTguLjFiMmEyOTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTY1OSw3 ICsxNjU5LDcgQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCWludCBudW1fZmVuY2VfcmVn czsgLyogOCBvbiBwcmUtOTY1LCAxNiBvdGhlcndpc2UgKi8KIAogCXVuc2lnbmVkIGludCBmc2Jf ZnJlcSwgbWVtX2ZyZXEsIGlzX2RkcjM7Ci0JdW5zaWduZWQgaW50IHZsdl9jZGNsa19mcmVxOwor CXVuc2lnbmVkIGludCBjZGNsa19mcmVxOwogCXVuc2lnbmVkIGludCBocGxsX2ZyZXE7CiAKIAkv KioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlNTRlOTQ4Li5iOTE4NjJl IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00ODc5LDE2ICs0ODc5LDE2 IEBAIHN0YXRpYyB2b2lkIHZsdl91cGRhdGVfY2RjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwogCi0JZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxID0gZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Rp c3BsYXlfY2xvY2tfc3BlZWQoZGV2KTsKKwlkZXZfcHJpdi0+Y2RjbGtfZnJlcSA9IGRldl9wcml2 LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKGRldik7CiAJRFJNX0RFQlVHX0RSSVZF UigiQ3VycmVudCBDRCBjbG9jayByYXRlOiAlZCBrSHpcbiIsCi0JCQkgZGV2X3ByaXYtPnZsdl9j ZGNsa19mcmVxKTsKKwkJCSBkZXZfcHJpdi0+Y2RjbGtfZnJlcSk7CiAKIAkvKgogCSAqIFByb2dy YW0gdGhlIGdtYnVzX2ZyZXEgYmFzZWQgb24gdGhlIGNkY2xrIGZyZXF1ZW5jeS4KIAkgKiBCU3Bl YyBlcnJvbmVvdXNseSBjbGFpbXMgd2Ugc2hvdWxkIGFpbSBmb3IgNE1IeiwgYnV0CiAJICogaW4g ZmFjdCAxTUh6IGlzIHRoZSBjb3JyZWN0IGZyZXF1ZW5jeS4KIAkgKi8KLQlJOTE1X1dSSVRFKEdN QlVTRlJFUV9WTFYsIERJVl9ST1VORF9VUChkZXZfcHJpdi0+dmx2X2NkY2xrX2ZyZXEsIDEwMDAp KTsKKwlJOTE1X1dSSVRFKEdNQlVTRlJFUV9WTFYsIERJVl9ST1VORF9VUChkZXZfcHJpdi0+Y2Rj bGtfZnJlcSwgMTAwMCkpOwogfQogCiAvKiBBZGp1c3QgQ0RjbGsgZGl2aWRlcnMgdG8gYWxsb3cg aGlnaCByZXMgb3Igc2F2ZSBwb3dlciBpZiBwb3NzaWJsZSAqLwpAQCAtNDg5Nyw3ICs0ODk3LDgg QEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19zZXRfY2RjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgaW50IGNkY2xrKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJdTMyIHZhbCwgY21kOwogCi0JV0FSTl9PTihkZXZfcHJpdi0+ZGlzcGxh eS5nZXRfZGlzcGxheV9jbG9ja19zcGVlZChkZXYpICE9IGRldl9wcml2LT52bHZfY2RjbGtfZnJl cSk7CisJV0FSTl9PTihkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZGlzcGxheV9jbG9ja19zcGVlZChk ZXYpCisJCQkJCSE9IGRldl9wcml2LT5jZGNsa19mcmVxKTsKIAogCWlmIChjZGNsayA+PSAzMjAw MDApIC8qIGp1bXAgdG8gaGlnaGVzdCB2b2x0YWdlIGZvciA0MDBNSHogdG9vICovCiAJCWNtZCA9 IDI7CkBAIC00OTYxLDcgKzQ5NjIsOCBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X3NldF9jZGNs ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgY2RjbGspCiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1MzIgdmFsLCBjbWQ7CiAKLQlX QVJOX09OKGRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKGRldikgIT0g ZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKTsKKwlXQVJOX09OKGRldl9wcml2LT5kaXNwbGF5Lmdl dF9kaXNwbGF5X2Nsb2NrX3NwZWVkKGRldikKKwkJCQkJCSE9IGRldl9wcml2LT5jZGNsa19mcmVx KTsKIAogCXN3aXRjaCAoY2RjbGspIHsKIAljYXNlIDMzMzMzMzoKQEAgLTUwNTAsNyArNTA1Miw3 IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfbW9kZXNldF9nbG9iYWxfcGlwZXMoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlpbnQgbWF4X3BpeGNsayA9IGludGVsX21vZGVfbWF4X3BpeGNsayhk ZXZfcHJpdik7CiAKIAlpZiAodmFsbGV5dmlld19jYWxjX2NkY2xrKGRldl9wcml2LCBtYXhfcGl4 Y2xrKSA9PQotCSAgICBkZXZfcHJpdi0+dmx2X2NkY2xrX2ZyZXEpCisJICAgIGRldl9wcml2LT5j ZGNsa19mcmVxKQogCQlyZXR1cm47CiAKIAkvKiBkaXNhYmxlL2VuYWJsZSBhbGwgY3VycmVudGx5 IGFjdGl2ZSBwaXBlcyB3aGlsZSB3ZSBjaGFuZ2UgY2RjbGsgKi8KQEAgLTUwNjgsNyArNTA3MCw3 IEBAIHN0YXRpYyB2b2lkIHZsdl9wcm9ncmFtX3BmaV9jcmVkaXRzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAllbHNlCiAJCWRlZmF1bHRfY3JlZGl0cyA9IFBGSV9DUkVESVQo OCk7CiAKLQlpZiAoRElWX1JPVU5EX0NMT1NFU1QoZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxLCAx MDAwKSA+PSBkZXZfcHJpdi0+cnBzLmN6X2ZyZXEpIHsKKwlpZiAoRElWX1JPVU5EX0NMT1NFU1Qo ZGV2X3ByaXYtPmNkY2xrX2ZyZXEsIDEwMDApID49IGRldl9wcml2LT5ycHMuY3pfZnJlcSkgewog CQkvKiBDSFYgc3VnZ2VzdGVkIHZhbHVlIGlzIDMxIG9yIDYzICovCiAJCWlmIChJU19DSEVSUllW SUVXKGRldl9wcml2KSkKIAkJCWNyZWRpdHMgPSBQRklfQ1JFRElUXzMxOwpAQCAtNTEwMSw3ICs1 MTAzLDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9yZXNvdXJjZXMo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnQgbWF4X3BpeGNsayA9IGludGVsX21vZGVfbWF4 X3BpeGNsayhkZXZfcHJpdik7CiAJaW50IHJlcV9jZGNsayA9IHZhbGxleXZpZXdfY2FsY19jZGNs ayhkZXZfcHJpdiwgbWF4X3BpeGNsayk7CiAKLQlpZiAocmVxX2NkY2xrICE9IGRldl9wcml2LT52 bHZfY2RjbGtfZnJlcSkgeworCWlmIChyZXFfY2RjbGsgIT0gZGV2X3ByaXYtPmNkY2xrX2ZyZXEp IHsKIAkJLyoKIAkJICogRklYTUU6IFdlIGNhbiBlbmQgdXAgaGVyZSB3aXRoIGFsbCBwb3dlciBk b21haW5zIG9mZiwgeWV0CiAJCSAqIHdpdGggYSBDRENMSyBmcmVxdWVuY3kgb3RoZXIgdGhhbiB0 aGUgbWluaW11bS4gVG8gYWNjb3VudAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==