From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 04/14] drm/i915: Clean up the .get_cdclk() assignment if ladder Date: Fri, 20 Jan 2017 20:21:55 +0200 Message-ID: <20170120182205.8141-5-ville.syrjala@linux.intel.com> References: <20170120182205.8141-1-ville.syrjala@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 ESMTPS id D67826EC48 for ; Fri, 20 Jan 2017 18:22:19 +0000 (UTC) In-Reply-To: <20170120182205.8141-1-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxl dCdzIGNsZWFuIHVwIHRoZSBtZXNzIHdlIGhhdmUgaW4gdGhlIGlmIGxhZGRlciB0aGF0IGFzc2ln bnMgdGhlCi5nZXRfY2RjbGsoKSBob29rcy4gVGhlIGdyb3VwaW5nIG9mIHRoZSBwbGF0Zm9ybXMg YnkgdGhlIGZ1bmN0aW9uCnJlc3VsdHMgaW4gYSB0aGluZyB0aGF0J3Mgbm90IHJlYWxseSBsZWdp YmxlLCBzbyBsZXQncyBkbyBpdCB0aGUKb3RoZXIgd2F5IGFyb3VuZCBhbmQgb3JkZXIgdGhlIGlm IGxhZGRlciBieSBwbGF0Zm9ybSBhbmQgZHVwbGljYXRlCndoYXRldmVyIGFzc2lnbm1lbnRzIHdl IG5lZWQuCgpUbyBmdXJ0aGVyIGF2b2lkIGNvbmZ1c2lvbiB3aXRoIHRoZSBmdW5jdGlvbiBuYW1l cyBsZXQncyByZW5hbWUKdGhlbSB0byBqdXN0IGZpeGVkXzxmcmVxPl9nZXRfY2RjbGsoKS4gVGhl IG90aGVyIG9wdGlvbiB3b3VsZApiZSB0byBkdXBsaWNhdGUgdGhlIGZ1bmN0aW9ucyBlbnRpcmVs eSBidXQgaXQgc2VlbXMgcXVpdGUKcG9pbnRsZXNzIHRvIGRvIHRoYXQgc2luY2UgZWFjaCBvbmUg anVzdCByZXR1cm5zIGEgZml4ZWQgdmFsdWUuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogQW5kZXIgQ29u c2VsdmFuIGRlIE9saXZlaXJhIDxjb25zZWx2YW4yQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0MSArKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYmQwZmRjMDRiYzky Li42NjhjNjFhZDQ1YTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTcz NjYsMjIgKzczNjYsMjIgQEAgc3RhdGljIGludCB2YWxsZXl2aWV3X2dldF9jZGNsayhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkJICAgICAgQ0NLX0RJU1BMQVlfQ0xPQ0tf Q09OVFJPTCk7CiB9CiAKLXN0YXRpYyBpbnQgaWxrX2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgaW50IGZpeGVkXzQ1MG1oel9nZXRfY2RjbGsoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXJldHVybiA0NTAwMDA7CiB9CiAK LXN0YXRpYyBpbnQgaTk0NV9nZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQorc3RhdGljIGludCBmaXhlZF80MDBtaHpfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIHsKIAlyZXR1cm4gNDAwMDAwOwogfQogCi1zdGF0aWMgaW50IGk5 MTVfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyBp bnQgZml4ZWRfMzMzbWh6X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiB7CiAJcmV0dXJuIDMzMzMzMzsKIH0KIAotc3RhdGljIGludCBpOXh4X21pc2NfZ2V0X2Nk Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyBpbnQgZml4ZWRf MjAwbWh6X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJ cmV0dXJuIDIwMDAwMDsKIH0KQEAgLTc0MzEsNyArNzQzMSw3IEBAIHN0YXRpYyBpbnQgaTkxNWdt X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQogfQogCi1z dGF0aWMgaW50IGk4NjVfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKK3N0YXRpYyBpbnQgZml4ZWRfMjY2bWh6X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJcmV0dXJuIDI2NjY2NzsKIH0KQEAgLTc0NzQsNyArNzQ3NCw3 IEBAIHN0YXRpYyBpbnQgaTg1eF9nZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGk4MzBfZ2V0X2NkY2xrKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyBpbnQgZml4ZWRfMTMzbWh6X2dl dF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJcmV0dXJuIDEz MzMzMzsKIH0KQEAgLTE2MTgwLDMyICsxNjE4MCwzOSBAQCB2b2lkIGludGVsX2luaXRfZGlzcGxh eV9ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRldl9wcml2LT5k aXNwbGF5LmdldF9jZGNsayA9IGhhc3dlbGxfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX1ZBTExF WVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ ZGlzcGxheS5nZXRfY2RjbGsgPSB2YWxsZXl2aWV3X2dldF9jZGNsazsKKwllbHNlIGlmIChJU19H RU42KGRldl9wcml2KSB8fCBJU19JVllCUklER0UoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlz cGxheS5nZXRfY2RjbGsgPSBmaXhlZF80MDBtaHpfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX0dF TjUoZGV2X3ByaXYpKQotCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBpbGtfZ2V0X2Nk Y2xrOwotCWVsc2UgaWYgKElTX0k5NDVHKGRldl9wcml2KSB8fCBJU19JOTY1RyhkZXZfcHJpdikg fHwKLQkJIElTX0dFTjYoZGV2X3ByaXYpIHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpCi0JCWRl dl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGk5NDVfZ2V0X2NkY2xrOworCQlkZXZfcHJpdi0+ ZGlzcGxheS5nZXRfY2RjbGsgPSBmaXhlZF80NTBtaHpfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElT X0dNNDUoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBnbTQ1X2dl dF9jZGNsazsKKwllbHNlIGlmIChJU19HNFgoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxh eS5nZXRfY2RjbGsgPSBnMzNfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX0k5NjVHTShkZXZfcHJp dikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGk5NjVnbV9nZXRfY2RjbGs7CisJ ZWxzZSBpZiAoSVNfSTk2NUcoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2Rj bGsgPSBmaXhlZF80MDBtaHpfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX1BJTkVWSUVXKGRldl9w cml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gcG52X2dldF9jZGNsazsKLQll bHNlIGlmIChJU19HMzMoZGV2X3ByaXYpIHx8IElTX0c0WChkZXZfcHJpdikpCisJZWxzZSBpZiAo SVNfRzMzKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gZzMzX2dl dF9jZGNsazsKLQllbHNlIGlmIChJU19JOTE1RyhkZXZfcHJpdikpCi0JCWRldl9wcml2LT5kaXNw bGF5LmdldF9jZGNsayA9IGk5MTVfZ2V0X2NkY2xrOwotCWVsc2UgaWYgKElTX0k5NDVHTShkZXZf cHJpdikgfHwgSVNfSTg0NUcoZGV2X3ByaXYpKQotCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2Rj bGsgPSBpOXh4X21pc2NfZ2V0X2NkY2xrOworCWVsc2UgaWYgKElTX0k5NDVHTShkZXZfcHJpdikp CisJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZpeGVkXzIwMG1oel9nZXRfY2RjbGs7 CisJZWxzZSBpZiAoSVNfSTk0NUcoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRf Y2RjbGsgPSBmaXhlZF80MDBtaHpfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX0k5MTVHTShkZXZf cHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGk5MTVnbV9nZXRfY2RjbGs7 CisJZWxzZSBpZiAoSVNfSTkxNUcoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRf Y2RjbGsgPSBmaXhlZF8zMzNtaHpfZ2V0X2NkY2xrOwogCWVsc2UgaWYgKElTX0k4NjVHKGRldl9w cml2KSkKLQkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gaTg2NV9nZXRfY2RjbGs7CisJ CWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZpeGVkXzI2Nm1oel9nZXRfY2RjbGs7CiAJ ZWxzZSBpZiAoSVNfSTg1WChkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNs ayA9IGk4NXhfZ2V0X2NkY2xrOworCWVsc2UgIGlmIChJU19JODQ1RyhkZXZfcHJpdikpCisJCWRl dl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZpeGVkXzIwMG1oel9nZXRfY2RjbGs7CiAJZWxz ZSB7IC8qIDgzMCAqLwogCQlXQVJOKCFJU19JODMwKGRldl9wcml2KSwgIlVua25vd24gcGxhdGZv cm0uIEFzc3VtaW5nIDEzMyBNSHogQ0RDTEtcbiIpOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRf Y2RjbGsgPSBpODMwX2dldF9jZGNsazsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0g Zml4ZWRfMTMzbWh6X2dldF9jZGNsazsKIAl9CiAKIAlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsK LS0gCjIuMTAuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==