From: Rodrigo Vivi Subject: [PATCH] drm/i915: Consolidate cdclk hooks. Date: Mon, 22 Oct 2018 10:21:52 -0700 Message-ID: <20181022172152.16271-1-rodrigo.vivi@intel.com> References: <20181019193326.GY9144@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 ESMTPS id ABB9B890AA for ; Mon, 22 Oct 2018 17:21:55 +0000 (UTC) In-Reply-To: <20181019193326.GY9144@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 V2UgZG9uJ3QgbmVlZCAyIGRpZmZlcmVudCBibG9ja3MuClNwZWNpYWxseSB3aXRoIG9uIGluIG9y ZGVyZWQgb2xkZXItdG8tbmV3ZXIgYW5kIHRoZSBvdGhlcgpvbmUgbmV3ZXItdG8tb2xkZXIuCgpM ZXQncyBzdGFydCBhbHdheXMgdXNpbmcgbmV3ZXItdG8tb2xkZXIgb3JkZXIKd2hlbiBpdCBtYWtl cyBzZW5zZS4KCnYyOiBBY2NlcHQgYWxsIGdvb2Qgc3VnZ2VzdGlvbnMgZnJvbSBWaWxsZToKICAg IC0gUmVtb3ZlIFxuIHNpbmNlIGl0IGlzIHVuZGVyIDgwIGNvbHMgbm93CiAgICAtIFVzZSBnZXQv c2V0L2NhbGMgb3JkZXIgb24gYWxsIGJsb2NrcwogICAgLSBGaXggcGxhdGZvcm0gc29ydGluZwoK Q2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYyB8IDkxICsrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDUyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IDI5MDc1Yzc2MzQyOC4u MTExOTY3YzFmMmVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNs ay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKQEAgLTI3NzcsODAg KzI3NzcsNjcgQEAgdm9pZCBpbnRlbF91cGRhdGVfcmF3Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKICAqLwogdm9pZCBpbnRlbF9pbml0X2NkY2xrX2hvb2tzKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikpIHsKLQkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gY2h2X3NldF9jZGNsazsKLQkJ ZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KLQkJCXZsdl9tb2Rlc2V0X2Nh bGNfY2RjbGs7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewotCQlkZXZf cHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSB2bHZfc2V0X2NkY2xrOwotCQlkZXZfcHJpdi0+ZGlz cGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPQotCQkJdmx2X21vZGVzZXRfY2FsY19jZGNsazsKLQl9 IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKLQkJZGV2X3ByaXYtPmRpc3BsYXku c2V0X2NkY2xrID0gYmR3X3NldF9jZGNsazsKLQkJZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNldF9j YWxjX2NkY2xrID0KLQkJCWJkd19tb2Rlc2V0X2NhbGNfY2RjbGs7Ci0JfSBlbHNlIGlmIChJU19H RU45X0xQKGRldl9wcml2KSkgewotCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSBieHRf c2V0X2NkY2xrOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPQotCQkJ Ynh0X21vZGVzZXRfY2FsY19jZGNsazsKLQl9IGVsc2UgaWYgKElTX0dFTjlfQkMoZGV2X3ByaXYp KSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5LnNldF9jZGNsayA9IHNrbF9zZXRfY2RjbGs7Ci0JCWRl dl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayA9Ci0JCQlza2xfbW9kZXNldF9jYWxj X2NkY2xrOwotCX0gZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpIHsKLQkJZGV2X3By aXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gY25sX3NldF9jZGNsazsKLQkJZGV2X3ByaXYtPmRpc3Bs YXkubW9kZXNldF9jYWxjX2NkY2xrID0KLQkJCWNubF9tb2Rlc2V0X2NhbGNfY2RjbGs7Ci0JfSBl bHNlIGlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkgeworCWlmIChJU19JQ0VMQUtFKGRldl9wcml2 KSkgeworCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBpY2xfZ2V0X2NkY2xrOwogCQlk ZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSBpY2xfc2V0X2NkY2xrOwogCQlkZXZfcHJpdi0+ ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPSBpY2xfbW9kZXNldF9jYWxjX2NkY2xrOwotCX0K LQotCWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkKLQkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Nk Y2xrID0gaWNsX2dldF9jZGNsazsKLQllbHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkK Kwl9IGVsc2UgaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNw bGF5LmdldF9jZGNsayA9IGNubF9nZXRfY2RjbGs7Ci0JZWxzZSBpZiAoSVNfR0VOOV9CQyhkZXZf cHJpdikpCi0JCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IHNrbF9nZXRfY2RjbGs7Ci0J ZWxzZSBpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LnNldF9j ZGNsayA9IGNubF9zZXRfY2RjbGs7CisJCWRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY2FsY19j ZGNsayA9IGNubF9tb2Rlc2V0X2NhbGNfY2RjbGs7CisJfSBlbHNlIGlmIChJU19HRU45X0xQKGRl dl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBieHRfZ2V0X2NkY2xr OwotCWVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5 LnNldF9jZGNsayA9IGJ4dF9zZXRfY2RjbGs7CisJCWRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRf Y2FsY19jZGNsayA9IGJ4dF9tb2Rlc2V0X2NhbGNfY2RjbGs7CisJfSBlbHNlIGlmIChJU19HRU45 X0JDKGRldl9wcml2KSkgeworCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBza2xfZ2V0 X2NkY2xrOworCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSBza2xfc2V0X2NkY2xrOwor CQlkZXZfcHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPSBza2xfbW9kZXNldF9jYWxj X2NkY2xrOworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKKwkJZGV2X3By aXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gdmx2X2dldF9jZGNsazsKKwkJZGV2X3ByaXYtPmRpc3Bs YXkuc2V0X2NkY2xrID0gY2h2X3NldF9jZGNsazsKKwkJZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNl dF9jYWxjX2NkY2xrID0gdmx2X21vZGVzZXRfY2FsY19jZGNsazsKKwl9IGVsc2UgaWYgKElTX0JS T0FEV0VMTChkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gYmR3 X2dldF9jZGNsazsKLQllbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkKKwkJZGV2X3ByaXYt PmRpc3BsYXkuc2V0X2NkY2xrID0gYmR3X3NldF9jZGNsazsKKwkJZGV2X3ByaXYtPmRpc3BsYXku bW9kZXNldF9jYWxjX2NkY2xrID0gYmR3X21vZGVzZXRfY2FsY19jZGNsazsKKwl9IGVsc2UgaWYg KElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9 IGhzd19nZXRfY2RjbGs7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpCisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2 KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSB2bHZfZ2V0X2NkY2xrOwotCWVs c2UgaWYgKElTX0dFTjYoZGV2X3ByaXYpIHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpCisJCWRl dl9wcml2LT5kaXNwbGF5LnNldF9jZGNsayA9IHZsdl9zZXRfY2RjbGs7CisJCWRldl9wcml2LT5k aXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayA9IHZsdl9tb2Rlc2V0X2NhbGNfY2RjbGs7CisJfSBl bHNlIGlmIChJU19HRU42KGRldl9wcml2KSB8fCBJU19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJ CWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZpeGVkXzQwMG1oel9nZXRfY2RjbGs7Ci0J ZWxzZSBpZiAoSVNfR0VONShkZXZfcHJpdikpCisJfSBlbHNlIGlmIChJU19HRU41KGRldl9wcml2 KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBmaXhlZF80NTBtaHpfZ2V0X2Nk Y2xrOwotCWVsc2UgaWYgKElTX0dNNDUoZGV2X3ByaXYpKQorCX0gZWxzZSBpZiAoSVNfR000NShk ZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gZ200NV9nZXRfY2Rj bGs7Ci0JZWxzZSBpZiAoSVNfRzQ1KGRldl9wcml2KSkKKwl9IGVsc2UgaWYgKElTX0c0NShkZXZf cHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gZzMzX2dldF9jZGNsazsK LQllbHNlIGlmIChJU19JOTY1R00oZGV2X3ByaXYpKQorCX0gZWxzZSBpZiAoSVNfSTk2NUdNKGRl dl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBpOTY1Z21fZ2V0X2Nk Y2xrOwotCWVsc2UgaWYgKElTX0k5NjVHKGRldl9wcml2KSkKKwl9IGVsc2UgaWYgKElTX0k5NjVH KGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBmaXhlZF80MDBt aHpfZ2V0X2NkY2xrOwotCWVsc2UgaWYgKElTX1BJTkVWSUVXKGRldl9wcml2KSkKKwl9IGVsc2Ug aWYgKElTX1BJTkVWSUVXKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2Rj bGsgPSBwbnZfZ2V0X2NkY2xrOwotCWVsc2UgaWYgKElTX0czMyhkZXZfcHJpdikpCisJfSBlbHNl IGlmIChJU19HMzMoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9 IGczM19nZXRfY2RjbGs7Ci0JZWxzZSBpZiAoSVNfSTk0NUdNKGRldl9wcml2KSkKKwl9IGVsc2Ug aWYgKElTX0k5NDVHTShkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xr ID0gaTk0NWdtX2dldF9jZGNsazsKLQllbHNlIGlmIChJU19JOTQ1RyhkZXZfcHJpdikpCisJfSBl bHNlIGlmIChJU19JOTQ1RyhkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Nk Y2xrID0gZml4ZWRfNDAwbWh6X2dldF9jZGNsazsKLQllbHNlIGlmIChJU19JOTE1R00oZGV2X3By aXYpKQorCX0gZWxzZSBpZiAoSVNfSTkxNUdNKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlz cGxheS5nZXRfY2RjbGsgPSBpOTE1Z21fZ2V0X2NkY2xrOwotCWVsc2UgaWYgKElTX0k5MTVHKGRl dl9wcml2KSkKKwl9IGVsc2UgaWYgKElTX0k5MTVHKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ ZGlzcGxheS5nZXRfY2RjbGsgPSBmaXhlZF8zMzNtaHpfZ2V0X2NkY2xrOwotCWVsc2UgaWYgKElT X0k4NjVHKGRldl9wcml2KSkKKwl9IGVsc2UgaWYgKElTX0k4NjVHKGRldl9wcml2KSkgewogCQlk ZXZfcHJpdi0+ZGlzcGxheS5nZXRfY2RjbGsgPSBmaXhlZF8yNjZtaHpfZ2V0X2NkY2xrOwotCWVs c2UgaWYgKElTX0k4NVgoZGV2X3ByaXYpKQorCX0gZWxzZSBpZiAoSVNfSTg1WChkZXZfcHJpdikp IHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gaTg1eF9nZXRfY2RjbGs7Ci0JZWxz ZSBpZiAoSVNfSTg0NUcoZGV2X3ByaXYpKQorCX0gZWxzZSBpZiAoSVNfSTg0NUcoZGV2X3ByaXYp KSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZpeGVkXzIwMG1oel9nZXRfY2Rj bGs7Ci0JZWxzZSB7IC8qIDgzMCAqLworCX0gZWxzZSB7IC8qIDgzMCAqLwogCQlXQVJOKCFJU19J ODMwKGRldl9wcml2KSwKIAkJICAgICAiVW5rbm93biBwbGF0Zm9ybS4gQXNzdW1pbmcgMTMzIE1I eiBDRENMS1xuIik7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGZpeGVkXzEzM21o el9nZXRfY2RjbGs7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=