From: Matt Roper Subject: [PATCH v4 5/8] drm/i915: Consolidate {bxt, cnl, icl}_uninit_cdclk Date: Tue, 10 Sep 2019 08:42:49 -0700 Message-ID: <20190910154252.30503-6-matthew.d.roper@intel.com> References: <20190910154252.30503-1-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9EB626E91E for ; Tue, 10 Sep 2019 15:43:12 +0000 (UTC) In-Reply-To: <20190910154252.30503-1-matthew.d.roper@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 VGhlIHVuaW5pdGlhbGl6ZSBmbG93IGlzIHRoZSBzYW1lIG9uIGFsbCBvZiB0aGVzZSBwbGF0Zm9y bXMsIGFzaWRlIGZyb20KY2FsY3VsYXRpbmcgYSBkaWZmZXJlbnQgZnJlcXVlbmN5IGxldmVsLgoK djI6IFJldmVyc2UgcGxhdGZvcm0gY29uZGl0aW9uYWwgb3JkZXIgZm9yIGNvbnNpc3RlbmN5LiAg KFZpbGxlKQoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfY2RjbGsuYyB8IDQ4 ICsrKysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCsp LCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2NkY2xrLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Nk Y2xrLmMKaW5kZXggM2M3NjNjNzBlYmVhLi41MThjYzk1NDU2ZDMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2NkY2xrLmMKQEAgLTE2ODMsNyArMTY4MywxOCBAQCBzdGF0 aWMgdm9pZCBieHRfdW5pbml0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAogCWNkY2xrX3N0YXRlLmNkY2xrID0gY2RjbGtfc3RhdGUuYnlwYXNzOwogCWNkY2xrX3N0 YXRlLnZjbyA9IDA7Ci0JY2RjbGtfc3RhdGUudm9sdGFnZV9sZXZlbCA9IGJ4dF9jYWxjX3ZvbHRh Z2VfbGV2ZWwoY2RjbGtfc3RhdGUuY2RjbGspOworCWlmIChJU19FTEtIQVJUTEFLRShkZXZfcHJp dikpCisJCWNkY2xrX3N0YXRlLnZvbHRhZ2VfbGV2ZWwgPQorCQkJZWhsX2NhbGNfdm9sdGFnZV9s ZXZlbChjZGNsa19zdGF0ZS5jZGNsayk7CisJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSAxMSkKKwkJY2RjbGtfc3RhdGUudm9sdGFnZV9sZXZlbCA9CisJCQlpY2xfY2FsY192b2x0YWdl X2xldmVsKGNkY2xrX3N0YXRlLmNkY2xrKTsKKwllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDEwKQorCQljZGNsa19zdGF0ZS52b2x0YWdlX2xldmVsID0KKwkJCWNubF9jYWxjX3ZvbHRh Z2VfbGV2ZWwoY2RjbGtfc3RhdGUuY2RjbGspOworCWVsc2UKKwkJY2RjbGtfc3RhdGUudm9sdGFn ZV9sZXZlbCA9CisJCQlieHRfY2FsY192b2x0YWdlX2xldmVsKGNkY2xrX3N0YXRlLmNkY2xrKTsK IAogCWJ4dF9zZXRfY2RjbGsoZGV2X3ByaXYsICZjZGNsa19zdGF0ZSwgSU5WQUxJRF9QSVBFKTsK IH0KQEAgLTE3MjksMjIgKzE3NDAsNiBAQCBzdGF0aWMgdm9pZCBpY2xfaW5pdF9jZGNsayhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJYnh0X3NldF9jZGNsayhkZXZfcHJpdiwg JnNhbml0aXplZF9zdGF0ZSwgSU5WQUxJRF9QSVBFKTsKIH0KIAotc3RhdGljIHZvaWQgaWNsX3Vu aW5pdF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0Jc3RydWN0 IGludGVsX2NkY2xrX3N0YXRlIGNkY2xrX3N0YXRlID0gZGV2X3ByaXYtPmNkY2xrLmh3OwotCi0J Y2RjbGtfc3RhdGUuY2RjbGsgPSBjZGNsa19zdGF0ZS5ieXBhc3M7Ci0JY2RjbGtfc3RhdGUudmNv ID0gMDsKLQlpZiAoSVNfRUxLSEFSVExBS0UoZGV2X3ByaXYpKQotCQljZGNsa19zdGF0ZS52b2x0 YWdlX2xldmVsID0KLQkJCWVobF9jYWxjX3ZvbHRhZ2VfbGV2ZWwoY2RjbGtfc3RhdGUuY2RjbGsp OwotCWVsc2UKLQkJY2RjbGtfc3RhdGUudm9sdGFnZV9sZXZlbCA9Ci0JCQlpY2xfY2FsY192b2x0 YWdlX2xldmVsKGNkY2xrX3N0YXRlLmNkY2xrKTsKLQotCWJ4dF9zZXRfY2RjbGsoZGV2X3ByaXYs ICZjZGNsa19zdGF0ZSwgSU5WQUxJRF9QSVBFKTsKLX0KLQogc3RhdGljIHZvaWQgY25sX2luaXRf Y2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRl bF9jZGNsa19zdGF0ZSBjZGNsa19zdGF0ZTsKQEAgLTE3NjQsMTcgKzE3NTksNiBAQCBzdGF0aWMg dm9pZCBjbmxfaW5pdF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ Ynh0X3NldF9jZGNsayhkZXZfcHJpdiwgJmNkY2xrX3N0YXRlLCBJTlZBTElEX1BJUEUpOwogfQog Ci1zdGF0aWMgdm9pZCBjbmxfdW5pbml0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKLXsKLQlzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgY2RjbGtfc3RhdGUgPSBkZXZf cHJpdi0+Y2RjbGsuaHc7Ci0KLQljZGNsa19zdGF0ZS5jZGNsayA9IGNkY2xrX3N0YXRlLmJ5cGFz czsKLQljZGNsa19zdGF0ZS52Y28gPSAwOwotCWNkY2xrX3N0YXRlLnZvbHRhZ2VfbGV2ZWwgPSBj bmxfY2FsY192b2x0YWdlX2xldmVsKGNkY2xrX3N0YXRlLmNkY2xrKTsKLQotCWJ4dF9zZXRfY2Rj bGsoZGV2X3ByaXYsICZjZGNsa19zdGF0ZSwgSU5WQUxJRF9QSVBFKTsKLX0KLQogLyoqCiAgKiBp bnRlbF9jZGNsa19pbml0IC0gSW5pdGlhbGl6ZSBDRENMSwogICogQGk5MTU6IGk5MTUgZGV2aWNl CkBAIC0xODA1LDE0ICsxNzg5LDEwIEBAIHZvaWQgaW50ZWxfY2RjbGtfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSkKICAqLwogdm9pZCBpbnRlbF9jZGNsa191bmluaXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7Ci0JaWYgKElOVEVMX0dFTihpOTE1KSA+PSAxMSkK LQkJaWNsX3VuaW5pdF9jZGNsayhpOTE1KTsKLQllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUp KQotCQljbmxfdW5pbml0X2NkY2xrKGk5MTUpOworCWlmIChJTlRFTF9HRU4oaTkxNSkgPj0gMTAg fHwgSVNfR0VOOV9MUChpOTE1KSkKKwkJYnh0X3VuaW5pdF9jZGNsayhpOTE1KTsKIAllbHNlIGlm IChJU19HRU45X0JDKGk5MTUpKQogCQlza2xfdW5pbml0X2NkY2xrKGk5MTUpOwotCWVsc2UgaWYg KElTX0dFTjlfTFAoaTkxNSkpCi0JCWJ4dF91bmluaXRfY2RjbGsoaTkxNSk7CiB9CiAKIC8qKgot LSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=