From: ville.syrjala@linux.intel.com Subject: [PATCH 04/14] drm/i915: Clean up the .get_cdclk() assignment if ladder Date: Mon, 19 Dec 2016 14:34:51 +0200 Message-ID: <20161219123501.3750-5-ville.syrjala@linux.intel.com> References: <20161219123501.3750-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 966916E600 for ; Mon, 19 Dec 2016 12:35:18 +0000 (UTC) In-Reply-To: <20161219123501.3750-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 Cc: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxl dCdzIGNsZWFuIHVwIHRoZSBtZXNzIHdlIGhhdmUgaW4gdGhlIGlmIGxhZGRlciB0aGF0IGFzc2ln bnMgdGhlCi5nZXRfY2RjbGsoKSBob29rcy4gVGhlIGdyb3VwaW5nIG9mIHRoZSBwbGF0Zm9ybXMg YnkgdGhlIGZ1bmN0aW9uCnJlc3VsdHMgaW4gYSB0aGluZyB0aGF0J3Mgbm90IHJlYWxseSBsZWdp YmxlLCBzbyBsZXQncyBkbyBpdCB0aGUKb3RoZXIgd2F5IGFyb3VuZCBhbmQgb3JkZXIgdGhlIGlm IGxhZGRlciBieSBwbGF0Zm9ybSBhbmQgZHVwbGljYXRlCndoYXRldmVyIGFzc2lnbm1lbnRzIHdl IG5lZWQuCgpUbyBmdXJ0aGVyIGF2b2lkIGNvbmZ1c2lvbiB3aXRoIHRoZSBmdW5jdGlvbiBuYW1l cyBsZXQncyByZW5hbWUKdGhlbSB0byBqdXN0IGZpeGVkXzxmcmVxPl9nZXRfY2RjbGsoKS4gVGhl IG90aGVyIG9wdGlvbiB3b3VsZApiZSB0byBkdXBsaWNhdGUgdGhlIGZ1bmN0aW9ucyBlbnRpcmVs eSBidXQgaXQgc2VlbXMgcXVpdGUKcG9pbnRsZXNzIHRvIGRvIHRoYXQgc2luY2UgZWFjaCBvbmUg anVzdCByZXR1cm5zIGEgZml4ZWQgdmFsdWUuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQxICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBiYmZlZjM0ODc4M2IuLjI5Zjkx ZTc5OTI3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNzM3OSwyMiAr NzM3OSwyMiBAQCBzdGF0aWMgaW50IHZhbGxleXZpZXdfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJCQkgICAgICBDQ0tfRElTUExBWV9DTE9DS19DT05UUk9M KTsKIH0KIAotc3RhdGljIGludCBpbGtfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKK3N0YXRpYyBpbnQgZml4ZWRfNDUwbWh6X2dldF9jZGNsayhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJcmV0dXJuIDQ1MDAwMDsKIH0KIAotc3RhdGlj IGludCBpOTQ1X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitz dGF0aWMgaW50IGZpeGVkXzQwMG1oel9nZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewogCXJldHVybiA0MDAwMDA7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9nZXRf Y2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIGludCBmaXhl ZF8zMzNtaHpfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlyZXR1cm4gMzMzMzMzOwogfQogCi1zdGF0aWMgaW50IGk5eHhfbWlzY19nZXRfY2RjbGsoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIGludCBmaXhlZF8yMDBtaHpf Z2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlyZXR1cm4g MjAwMDAwOwogfQpAQCAtNzQ0NCw3ICs3NDQ0LDcgQEAgc3RhdGljIGludCBpOTE1Z21fZ2V0X2Nk Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9CiB9CiAKLXN0YXRpYyBp bnQgaTg2NV9nZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3Rh dGljIGludCBmaXhlZF8yNjZtaHpfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIHsKIAlyZXR1cm4gMjY2NjY3OwogfQpAQCAtNzQ4Nyw3ICs3NDg3LDcgQEAgc3Rh dGljIGludCBpODV4X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaTgzMF9nZXRfY2RjbGsoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIGludCBmaXhlZF8xMzNtaHpfZ2V0X2NkY2xr KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlyZXR1cm4gMTMzMzMzOwog fQpAQCAtMTYwOTgsMzIgKzE2MDk4LDM5IEBAIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5X2hvb2tz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZGV2X3ByaXYtPmRpc3BsYXku Z2V0X2NkY2xrID0gaGFzd2VsbF9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhk ZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5 LmdldF9jZGNsayA9IHZhbGxleXZpZXdfZ2V0X2NkY2xrOworCWVsc2UgaWYgKElTX0dFTjYoZGV2 X3ByaXYpIHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5Lmdl dF9jZGNsayA9IGZpeGVkXzQwMG1oel9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfR0VONShkZXZf cHJpdikpCi0JCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGlsa19nZXRfY2RjbGs7Ci0J ZWxzZSBpZiAoSVNfSTk0NUcoZGV2X3ByaXYpIHx8IElTX0k5NjVHKGRldl9wcml2KSB8fAotCQkg SVNfR0VONihkZXZfcHJpdikgfHwgSVNfSVZZQlJJREdFKGRldl9wcml2KSkKLQkJZGV2X3ByaXYt PmRpc3BsYXkuZ2V0X2NkY2xrID0gaTk0NV9nZXRfY2RjbGs7CisJCWRldl9wcml2LT5kaXNwbGF5 LmdldF9jZGNsayA9IGZpeGVkXzQ1MG1oel9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfR000NShk ZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGdtNDVfZ2V0X2NkY2xr OworCWVsc2UgaWYgKElTX0c0WChkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmdldF9j ZGNsayA9IGczM19nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfSTk2NUdNKGRldl9wcml2KSkKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gaTk2NWdtX2dldF9jZGNsazsKKwllbHNlIGlm IChJU19JOTY1RyhkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZp eGVkXzQwMG1oel9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfUElORVZJRVcoZGV2X3ByaXYpKQog CQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBwbnZfZ2V0X2NkY2xrOwotCWVsc2UgaWYg KElTX0czMyhkZXZfcHJpdikgfHwgSVNfRzRYKGRldl9wcml2KSkKKwllbHNlIGlmIChJU19HMzMo ZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBnMzNfZ2V0X2NkY2xr OwotCWVsc2UgaWYgKElTX0k5MTVHKGRldl9wcml2KSkKLQkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0 X2NkY2xrID0gaTkxNV9nZXRfY2RjbGs7Ci0JZWxzZSBpZiAoSVNfSTk0NUdNKGRldl9wcml2KSB8 fCBJU19JODQ1RyhkZXZfcHJpdikpCi0JCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGk5 eHhfbWlzY19nZXRfY2RjbGs7CisJZWxzZSBpZiAoSVNfSTk0NUdNKGRldl9wcml2KSkKKwkJZGV2 X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gZml4ZWRfMjAwbWh6X2dldF9jZGNsazsKKwllbHNl IGlmIChJU19JOTQ1RyhkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9 IGZpeGVkXzQwMG1oel9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfSTkxNUdNKGRldl9wcml2KSkK IAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gaTkxNWdtX2dldF9jZGNsazsKKwllbHNl IGlmIChJU19JOTE1RyhkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9 IGZpeGVkXzMzM21oel9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfSTg2NUcoZGV2X3ByaXYpKQot CQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBpODY1X2dldF9jZGNsazsKKwkJZGV2X3By aXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gZml4ZWRfMjY2bWh6X2dldF9jZGNsazsKIAllbHNlIGlm IChJU19JODVYKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gaTg1 eF9nZXRfY2RjbGs7CisJZWxzZSAgaWYgKElTX0k4NDVHKGRldl9wcml2KSkKKwkJZGV2X3ByaXYt PmRpc3BsYXkuZ2V0X2NkY2xrID0gZml4ZWRfMjAwbWh6X2dldF9jZGNsazsKIAllbHNlIHsgLyog ODMwICovCiAJCVdBUk4oIUlTX0k4MzAoZGV2X3ByaXYpLCAiVW5rbm93biBwbGF0Zm9ybS4gQXNz dW1pbmcgMTMzIE1IeiBDRENMS1xuIik7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9 IGk4MzBfZ2V0X2NkY2xrOworCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBmaXhlZF8x MzNtaHpfZ2V0X2NkY2xrOwogCX0KIAogCWlmIChJU19HRU41KGRldl9wcml2KSkgewotLSAKMi4x MC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK