From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 08/11] drm/i915: Kill duplicated cdclk readout code from i2c Date: Fri, 13 Jun 2014 13:37:54 +0300 Message-ID: <1402655877-6460-9-git-send-email-ville.syrjala@linux.intel.com> References: <1402655877-6460-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 782B68A3AC for ; Fri, 13 Jun 2014 03:38:46 -0700 (PDT) In-Reply-To: <1402655877-6460-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl IGhhdmUgYSBzbGlnaHRseSBkaWZmZXJlbnQgd2F5IG9mIHJlYWRvaW5nIG91dCB0aGUgY2RjbGsg aW4KZ21idXNfc2V0X2ZyZXEoKS4gS2lsbCB0aGF0IGFuZCBqdXN0IGNhbGwgLmdldF9kaXNwbGF5 X2Nsb2NrX3NwZWVkKCkuCgpBbHNvIG5lZWQgdG8gcmVtb3ZlIHRoZSBHTUJVU0ZSRVEgdXBkYXRl IGZyb20gaW50ZWxfaTJjX3Jlc2V0KCkgc2luY2UKdGhhdCBnZXRzIGNhbGxlZCB3YXkgdG9vIGVh cmx5LiBMZXQncyBkbyBpdCBpbiBpbnRlbF9tb2Rlc2V0X2luaXRfaHcoKQppbnN0ZWFkLCBhbmQg YWxzbyBwdWxsIHRoZSBpbml0aWFsIHZsdl9jZGNsa19mcmVxIHVwZGF0ZSB0aGVyZSBmcm9tCmlu aXRfY2xvY2sgZ2F0aW5nLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAyNSArKysrKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMgICAg IHwgNTQgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAgNCAtLS0KIDQgZmlsZXMgY2hhbmdlZCwgMjEgaW5z ZXJ0aW9ucygrKSwgNjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IDYwMWU5N2UuLjMzY2MyMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTQ0MzAsNyArNDQzMCw3IEBAIHN0YXRpYyB2b2lkIG1vZGVzZXRfdXBkYXRlX2Ny dGNfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogfQogCiAvKiByZXR1cm5z IEhQTEwgZnJlcXVlbmN5IGluIGtIeiAqLwotaW50IHZhbGxleXZpZXdfZ2V0X3ZjbyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgaW50IHZhbGxleXZpZXdfZ2V0X3Zj byhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IGhwbGxfZnJlcSwg dmNvX2ZyZXFbXSA9IHsgODAwLCAxNjAwLCAyMDAwLCAyNDAwIH07CiAKQEAgLTQ0NDMsNiArNDQ0 MywyMiBAQCBpbnQgdmFsbGV5dmlld19nZXRfdmNvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAlyZXR1cm4gdmNvX2ZyZXFbaHBsbF9mcmVxXSAqIDEwMDA7CiB9CiAKK3N0YXRp YyB2b2lkIHZsdl91cGRhdGVfY2RjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCisJZGV2 X3ByaXYtPnZsdl9jZGNsa19mcmVxID0gZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Rpc3BsYXlfY2xv Y2tfc3BlZWQoZGV2KTsKKwlEUk1fREVCVUdfRFJJVkVSKCJDdXJyZW50IENEIGNsb2NrIHJhdGU6 ICVkIGtIeiIsCisJCQkgZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKTsKKworCS8qCisJICogUHJv Z3JhbSB0aGUgZ21idXNfZnJlcSBiYXNlZCBvbiB0aGUgY2RjbGsgZnJlcXVlbmN5LgorCSAqIEJT cGVjIGVycm9uZW91c2x5IGNsYWltcyB3ZSBzaG91bGQgYWltIGZvciA0TUh6LCBidXQKKwkgKiBp biBmYWN0IDFNSHogaXMgdGhlIGNvcnJlY3QgZnJlcXVlbmN5LgorCSAqLworCUk5MTVfV1JJVEUo R01CVVNGUkVRX1ZMViwgZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKTsKK30KKwogLyogQWRqdXN0 IENEY2xrIGRpdmlkZXJzIHRvIGFsbG93IGhpZ2ggcmVzIG9yIHNhdmUgcG93ZXIgaWYgcG9zc2li bGUgKi8KIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfc2V0X2NkY2xrKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGludCBjZGNsaykKIHsKQEAgLTQ0NTAsNyArNDQ2Niw2IEBAIHN0YXRpYyB2b2lkIHZh bGxleXZpZXdfc2V0X2NkY2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjZGNsaykKIAl1 MzIgdmFsLCBjbWQ7CiAKIAlXQVJOX09OKGRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Ns b2NrX3NwZWVkKGRldikgIT0gZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKTsKLQlkZXZfcHJpdi0+ dmx2X2NkY2xrX2ZyZXEgPSBjZGNsazsKIAogCWlmIChjZGNsayA+PSAzMjAwMDApIC8qIGp1bXAg dG8gaGlnaGVzdCB2b2x0YWdlIGZvciA0MDBNSHogdG9vICovCiAJCWNtZCA9IDI7CkBAIC00NTA3 LDggKzQ1MjIsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3NldF9jZGNsayhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgY2RjbGspCiAJdmx2X2J1bml0X3dyaXRlKGRldl9wcml2LCBCVU5J VF9SRUdfQklTT0MsIHZhbCk7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHBpb19sb2NrKTsK IAotCS8qIFNpbmNlIHdlIGNoYW5nZWQgdGhlIENEY2xrLCB3ZSBuZWVkIHRvIHVwZGF0ZSB0aGUg R01CVVNGUkVRIHRvbyAqLwotCWludGVsX2kyY19yZXNldChkZXYpOworCXZsdl91cGRhdGVfY2Rj bGsoZGV2KTsKIH0KIAogc3RhdGljIGludCB2YWxsZXl2aWV3X2NhbGNfY2RjbGsoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtMTE5NzQsNiArMTE5ODgsOSBAQCB2b2lkIGlu dGVsX21vZGVzZXRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCWludGVsX3By ZXBhcmVfZGRpKGRldik7CiAKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQorCQl2bHZfdXBkYXRl X2NkY2xrKGRldik7CisKIAlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZyhkZXYpOwogCiAJaW50ZWxf cmVzZXRfZHBpbyhkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA2NWNlMGJiLi41 NzQwYmUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtODAwLDcgKzgwMCw2IEBAIHZv aWQgaHN3X2Rpc2FibGVfaXBzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxf ZGlzcGxheV9zZXRfaW5pdF9wb3dlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2LCBib29s IGVuYWJsZSk7CiBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluCiBpbnRlbF9kaXNwbGF5 X3BvcnRfcG93ZXJfZG9tYWluKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyKTsK LWludCB2YWxsZXl2aWV3X2dldF92Y28oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIHZvaWQgaW50ZWxfbW9kZV9mcm9tX3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICptb2RlLAogCQkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19jb25maWcgKnBpcGVfY29uZmlnKTsK IGludCBpbnRlbF9mb3JtYXRfdG9fZm91cmNjKGludCBmb3JtYXQpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9pMmMuYwppbmRleCA5Y2U0ZjA5Li5iMzEwODhhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9pMmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMu YwpAQCAtMzQsMTEgKzM0LDYgQEAKICNpbmNsdWRlIDxkcm0vaTkxNV9kcm0uaD4KICNpbmNsdWRl ICJpOTE1X2Rydi5oIgogCi1lbnVtIGRpc3BfY2xrIHsKLQlDRENMSywKLQlDWkNMSwotfTsKLQog c3RydWN0IGdtYnVzX3BvcnQgewogCWNvbnN0IGNoYXIgKm5hbWU7CiAJaW50IHJlZzsKQEAgLTYz LDYwICs1OCwxMSBAQCB0b19pbnRlbF9nbWJ1cyhzdHJ1Y3QgaTJjX2FkYXB0ZXIgKmkyYykKIAly ZXR1cm4gY29udGFpbmVyX29mKGkyYywgc3RydWN0IGludGVsX2dtYnVzLCBhZGFwdGVyKTsKIH0K IAotc3RhdGljIGludCBnZXRfZGlzcF9jbGtfZGl2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKLQkJCSAgICBlbnVtIGRpc3BfY2xrIGNsaykKLXsKLQl1MzIgcmVnX3ZhbDsKLQlp bnQgY2xrX3JhdGlvOwotCi0JcmVnX3ZhbCA9IEk5MTVfUkVBRChDWkNMS19DRENMS19GUkVRX1JB VElPKTsKLQotCWlmIChjbGsgPT0gQ0RDTEspCi0JCWNsa19yYXRpbyA9Ci0JCQkoKHJlZ192YWwg JiBDRENMS19GUkVRX01BU0spID4+IENEQ0xLX0ZSRVFfU0hJRlQpICsgMTsKLQllbHNlCi0JCWNs a19yYXRpbyA9IChyZWdfdmFsICYgQ1pDTEtfRlJFUV9NQVNLKSArIDE7Ci0KLQlyZXR1cm4gY2xr X3JhdGlvOwotfQotCi1zdGF0aWMgdm9pZCBnbWJ1c19zZXRfZnJlcShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JaW50IHZjbywgZ21idXNfZnJlcSA9IDAsIGNkY2xrX2Rp djsKLQotCUJVR19PTighSVNfVkFMTEVZVklFVyhkZXZfcHJpdi0+ZGV2KSk7Ci0KLQl2Y28gPSB2 YWxsZXl2aWV3X2dldF92Y28oZGV2X3ByaXYpIC8gMTAwMDsKLQotCS8qIEdldCB0aGUgQ0RDTEsg ZGl2aWRlIHJhdGlvICovCi0JY2RjbGtfZGl2ID0gZ2V0X2Rpc3BfY2xrX2RpdihkZXZfcHJpdiwg Q0RDTEspOwotCi0JLyoKLQkgKiBQcm9ncmFtIHRoZSBnbWJ1c19mcmVxIGJhc2VkIG9uIHRoZSBj ZGNsayBmcmVxdWVuY3kuCi0JICogQlNwZWMgZXJyb25lb3VzbHkgY2xhaW1zIHdlIHNob3VsZCBh aW0gZm9yIDRNSHosIGJ1dAotCSAqIGluIGZhY3QgMU1IeiBpcyB0aGUgY29ycmVjdCBmcmVxdWVu Y3kuCi0JICovCi0JaWYgKGNkY2xrX2RpdikKLQkJZ21idXNfZnJlcSA9ICh2Y28gPDwgMSkgLyBj ZGNsa19kaXY7Ci0KLQlpZiAoV0FSTl9PTihnbWJ1c19mcmVxID09IDApKQotCQlyZXR1cm47Ci0K LQlJOTE1X1dSSVRFKEdNQlVTRlJFUV9WTFYsIGdtYnVzX2ZyZXEpOwotfQotCiB2b2lkCiBpbnRl bF9pMmNfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JLyoKLQkgKiBJbiBCSU9T LWxlc3Mgc3lzdGVtLCBwcm9ncmFtIHRoZSBjb3JyZWN0IGdtYnVzIGZyZXF1ZW5jeQotCSAqIGJl Zm9yZSByZWFkaW5nIGVkaWQuCi0JICovCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKLQkJZ21i dXNfc2V0X2ZyZXEoZGV2X3ByaXYpOwotCiAJSTkxNV9XUklURShkZXZfcHJpdi0+Z3Bpb19tbWlv X2Jhc2UgKyBHTUJVUzAsIDApOwogCUk5MTVfV1JJVEUoZGV2X3ByaXYtPmdwaW9fbW1pb19iYXNl ICsgR01CVVM0LCAwKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDY3ZjAxOWMxLi45 ZDdiMDgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTU1MzUsMTAgKzU1MzUsNiBAQCBz dGF0aWMgdm9pZCB2YWxsZXl2aWV3X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJfQogCURSTV9ERUJVR19EUklWRVIoIkREUiBzcGVlZDogJWQgTUh6IiwgZGV2X3By aXYtPm1lbV9mcmVxKTsKIAotCWRldl9wcml2LT52bHZfY2RjbGtfZnJlcSA9IGRldl9wcml2LT5k aXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKGRldik7Ci0JRFJNX0RFQlVHX0RSSVZFUigi Q3VycmVudCBDRCBjbG9jayByYXRlOiAlZCBrSHoiLAotCQkJIGRldl9wcml2LT52bHZfY2RjbGtf ZnJlcSk7Ci0KIAlJOTE1X1dSSVRFKERTUENMS19HQVRFX0QsIFZSSFVOSVRfQ0xPQ0tfR0FURV9E SVNBQkxFKTsKIAogCS8qIFdhRGlzYWJsZUVhcmx5Q3VsbDp2bHYgKi8KLS0gCjEuOC41LjUKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==