From: Matt Roper Subject: [PATCH v4 8/8] drm/i915: Consolidate {bxt, cnl, icl}_init_cdclk Date: Tue, 10 Sep 2019 08:42:52 -0700 Message-ID: <20190910154252.30503-9-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 82EB46E921 for ; Tue, 10 Sep 2019 15:43:20 +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 VGhlIEJYVCBhbmQgQ05MIGZ1bmN0aW9ucyB3ZXJlIGFscmVhZHkgYmFzaWNhbGx5IGlkZW50aWNh bCwgd2hlcmVhcwpJQ0wncyBmdW5jdGlvbiB0cmllZCB0byBkbyBpdHMgb3duIHNhbml0aXphdGlv biByYXRoZXIgdGhhbiBjYWxsaW5nCmJ4dF9zYW5pdGl6ZV9jZGNsay4KClRoaXMgc2hvdWxkIGFj dHVhbGx5IGZpeCBhIGJ1ZyBpbiBvdXIgSUNMIGluaXRpYWxpemF0aW9uIHdoZXJlIGl0IHdvdWxk CmNvbnNpZGVyIHRoZSAvMiBDRDJYIGRpdmlkZXIgaW52YWxpZCBhbmQgZm9yY2UgYW4gdW5uZWNl c3NhcnkKc2FuaXRpemF0aW9uICh3ZSBub3cgaGF2ZSB2YWxpZCBjbG9jayBmcmVxdWVuY2llcyB0 aGF0IHVzZSB0aGlzCmRpdmlkZXIpLgoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5y b3BlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfY2RjbGsuYyB8IDY1ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy IGluc2VydGlvbnMoKyksIDYzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfY2RjbGsuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfY2RjbGsuYwppbmRleCA2ODZjMWU2MTAwZjAuLjNiMjk2NmExNmVjNyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9jZGNsay5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfY2RjbGsuYwpAQCAtMTcxMCw2MyAr MTcxMCw2IEBAIHN0YXRpYyB2b2lkIGJ4dF91bmluaXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCWJ4dF9zZXRfY2RjbGsoZGV2X3ByaXYsICZjZGNsa19zdGF0ZSwg SU5WQUxJRF9QSVBFKTsKIH0KIAotc3RhdGljIHZvaWQgaWNsX2luaXRfY2RjbGsoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCXN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSBz YW5pdGl6ZWRfc3RhdGU7Ci0JdTMyIHZhbDsKLQotCS8qIFRoaXMgc2V0cyBkZXZfcHJpdi0+Y2Rj bGsuaHcuICovCi0JaW50ZWxfdXBkYXRlX2NkY2xrKGRldl9wcml2KTsKLQlpbnRlbF9kdW1wX2Nk Y2xrX3N0YXRlKCZkZXZfcHJpdi0+Y2RjbGsuaHcsICJDdXJyZW50IENEQ0xLIik7Ci0KLQkvKiBU aGlzIG1lYW5zIENEQ0xLIGRpc2FibGVkLiAqLwotCWlmIChkZXZfcHJpdi0+Y2RjbGsuaHcuY2Rj bGsgPT0gZGV2X3ByaXYtPmNkY2xrLmh3LmJ5cGFzcykKLQkJZ290byBzYW5pdGl6ZTsKLQotCXZh bCA9IEk5MTVfUkVBRChDRENMS19DVEwpOwotCi0JaWYgKCh2YWwgJiBCWFRfQ0RDTEtfQ0QyWF9E SVZfU0VMX01BU0spICE9IDApCi0JCWdvdG8gc2FuaXRpemU7Ci0KLQlpZiAoKHZhbCAmIENEQ0xL X0ZSRVFfREVDSU1BTF9NQVNLKSAhPQotCSAgICBza2xfY2RjbGtfZGVjaW1hbChkZXZfcHJpdi0+ Y2RjbGsuaHcuY2RjbGspKQotCQlnb3RvIHNhbml0aXplOwotCi0JcmV0dXJuOwotCi1zYW5pdGl6 ZToKLQlEUk1fREVCVUdfS01TKCJTYW5pdGl6aW5nIGNkY2xrIHByb2dyYW1tZWQgYnkgcHJlLW9z XG4iKTsKLQotCXNhbml0aXplZF9zdGF0ZS5yZWYgPSBkZXZfcHJpdi0+Y2RjbGsuaHcucmVmOwot CXNhbml0aXplZF9zdGF0ZS5jZGNsayA9IGJ4dF9jYWxjX2NkY2xrKGRldl9wcml2LCAwKTsKLQlz YW5pdGl6ZWRfc3RhdGUudmNvID0gYnh0X2NhbGNfY2RjbGtfcGxsX3ZjbyhkZXZfcHJpdiwKLQkJ CQkJCSAgICAgc2FuaXRpemVkX3N0YXRlLmNkY2xrKTsKLQlzYW5pdGl6ZWRfc3RhdGUudm9sdGFn ZV9sZXZlbCA9Ci0JCWRldl9wcml2LT5kaXNwbGF5LmNhbGNfdm9sdGFnZV9sZXZlbChzYW5pdGl6 ZWRfc3RhdGUuY2RjbGspOwotCi0JYnh0X3NldF9jZGNsayhkZXZfcHJpdiwgJnNhbml0aXplZF9z dGF0ZSwgSU5WQUxJRF9QSVBFKTsKLX0KLQotc3RhdGljIHZvaWQgY25sX2luaXRfY2RjbGsoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCXN0cnVjdCBpbnRlbF9jZGNsa19z dGF0ZSBjZGNsa19zdGF0ZTsKLQotCWJ4dF9zYW5pdGl6ZV9jZGNsayhkZXZfcHJpdik7Ci0KLQlp ZiAoZGV2X3ByaXYtPmNkY2xrLmh3LmNkY2xrICE9IDAgJiYKLQkgICAgZGV2X3ByaXYtPmNkY2xr Lmh3LnZjbyAhPSAwKQotCQlyZXR1cm47Ci0KLQljZGNsa19zdGF0ZSA9IGRldl9wcml2LT5jZGNs ay5odzsKLQotCWNkY2xrX3N0YXRlLmNkY2xrID0gYnh0X2NhbGNfY2RjbGsoZGV2X3ByaXYsIDAp OwotCWNkY2xrX3N0YXRlLnZjbyA9IGJ4dF9jYWxjX2NkY2xrX3BsbF92Y28oZGV2X3ByaXYsIGNk Y2xrX3N0YXRlLmNkY2xrKTsKLQljZGNsa19zdGF0ZS52b2x0YWdlX2xldmVsID0KLQkJZGV2X3By aXYtPmRpc3BsYXkuY2FsY192b2x0YWdlX2xldmVsKGNkY2xrX3N0YXRlLmNkY2xrKTsKLQotCWJ4 dF9zZXRfY2RjbGsoZGV2X3ByaXYsICZjZGNsa19zdGF0ZSwgSU5WQUxJRF9QSVBFKTsKLX0KLQog LyoqCiAgKiBpbnRlbF9jZGNsa19pbml0IC0gSW5pdGlhbGl6ZSBDRENMSwogICogQGk5MTU6IGk5 MTUgZGV2aWNlCkBAIC0xNzc4LDE0ICsxNzIxLDEwIEBAIHN0YXRpYyB2b2lkIGNubF9pbml0X2Nk Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogdm9pZCBpbnRlbF9j ZGNsa19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewotCWlmIChJTlRFTF9H RU4oaTkxNSkgPj0gMTEpCi0JCWljbF9pbml0X2NkY2xrKGk5MTUpOwotCWVsc2UgaWYgKElTX0NB Tk5PTkxBS0UoaTkxNSkpCi0JCWNubF9pbml0X2NkY2xrKGk5MTUpOworCWlmIChJU19HRU45X0xQ KGk5MTUpIHx8IElOVEVMX0dFTihpOTE1KSA+PSAxMCkKKwkJYnh0X2luaXRfY2RjbGsoaTkxNSk7 CiAJZWxzZSBpZiAoSVNfR0VOOV9CQyhpOTE1KSkKIAkJc2tsX2luaXRfY2RjbGsoaTkxNSk7Ci0J ZWxzZSBpZiAoSVNfR0VOOV9MUChpOTE1KSkKLQkJYnh0X2luaXRfY2RjbGsoaTkxNSk7CiB9CiAK IC8qKgotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZng=