From: Ville Syrjala Subject: [PATCH 7/8] drm/i915: Use cdclk_state->voltage on CNL Date: Wed, 18 Oct 2017 23:48:24 +0300 Message-ID: <20171018204825.2500-8-ville.syrjala@linux.intel.com> References: <20171018204825.2500-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 73EB06E969 for ; Wed, 18 Oct 2017 20:49:07 +0000 (UTC) In-Reply-To: <20171018204825.2500-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRy YWNrIHRoZSBzeXN0ZW0gYWdlbnQgdm9sdGFnZSB3ZSByZXF1ZXN0IGZyb20gcGNvZGUgaW4gdGhl IGNkY2xrIHN0YXRlCm9uIENOTC4gQW5ub3lpbmdseSB3ZSBjYW4ndCBhY3R1YWxseSByZWFkIG91 dCB0aGUgY3VycmVudCB2YWx1ZSBzaW5jZQp0aGVyZSdzIG5vIHBjb2RlIGNvbW1hbmQgdG8gZG8g dGhhdCwgc28gd2UnbGwgaGF2ZSB0byBqdXN0IGFzc3VtZSB0aGF0Cml0IHdvcmtlZC4KCkNjOiBN aWthIEthaG9sYSA8bWlrYS5rYWhvbGFAaW50ZWwuY29tPgpDYzogTWFuYXNpIE5hdmFyZSA8bWFu YXNpLmQubmF2YXJlQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIHwg NDQgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyOCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y2RjbGsuYwppbmRleCAxYjRkY2Q5Njg5ZGEuLjc5NWExOGY2NGM0YyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jCkBAIC0xNTA1LDYgKzE1MDUsMTkgQEAgc3RhdGljIGludCBjbmxfY2Fs Y19jZGNsayhpbnQgbWluX2NkY2xrKQogCQlyZXR1cm4gMTY4MDAwOwogfQogCitzdGF0aWMgdTgg Y25sX2NhbGNfdm9sdGFnZShpbnQgY2RjbGspCit7CisJc3dpdGNoIChjZGNsaykgeworCWRlZmF1 bHQ6CisJY2FzZSAxNjgwMDA6CisJCXJldHVybiAwOworCWNhc2UgMzM2MDAwOgorCQlyZXR1cm4g MTsKKwljYXNlIDUyODAwMDoKKwkJcmV0dXJuIDI7CisJfQorfQorCiBzdGF0aWMgdm9pZCBjbmxf Y2RjbGtfcGxsX3VwZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJ IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtfc3RhdGUpCiB7CkBAIC0xNTM4LDcgKzE1 NTEsNyBAQCBzdGF0aWMgdm9pZCBjbmxfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAljZGNsa19zdGF0ZS0+Y2RjbGsgPSBjZGNsa19zdGF0ZS0+cmVmOwogCiAJ aWYgKGNkY2xrX3N0YXRlLT52Y28gPT0gMCkKLQkJcmV0dXJuOworCQlnb3RvIG91dDsKIAogCWRp dmlkZXIgPSBJOTE1X1JFQUQoQ0RDTEtfQ1RMKSAmIEJYVF9DRENMS19DRDJYX0RJVl9TRUxfTUFT SzsKIApAQCAtMTU1NSw2ICsxNTY4LDEzIEBAIHN0YXRpYyB2b2lkIGNubF9nZXRfY2RjbGsoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIAogCWNkY2xrX3N0YXRlLT5jZGNs ayA9IERJVl9ST1VORF9DTE9TRVNUKGNkY2xrX3N0YXRlLT52Y28sIGRpdik7CisKKyBvdXQ6CisJ LyoKKwkgKiBDYW4ndCByZWFkIHRoaXMgb3V0IDooIExldCdzIGFzc3VtZSBpdCdzCisJICogYXQg bGVhc3Qgd2hhdCB0aGUgQ0RDTEsgZnJlcXVlbmN5IHJlcXVpcmVzLgorCSAqLworCWNkY2xrX3N0 YXRlLT52b2x0YWdlID0gY25sX2NhbGNfdm9sdGFnZShjZGNsa19zdGF0ZS0+Y2RjbGspOwogfQog CiBzdGF0aWMgdm9pZCBjbmxfY2RjbGtfcGxsX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQpAQCAtMTU5NSw3ICsxNjE1LDcgQEAgc3RhdGljIHZvaWQgY25sX3NldF9j ZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJaW50IGNkY2xrID0g Y2RjbGtfc3RhdGUtPmNkY2xrOwogCWludCB2Y28gPSBjZGNsa19zdGF0ZS0+dmNvOwotCXUzMiB2 YWwsIGRpdmlkZXIsIHBjdV9hY2s7CisJdTMyIHZhbCwgZGl2aWRlcjsKIAlpbnQgcmV0OwogCiAJ bXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKQEAgLTE2MjQsMTkgKzE2NDQsNiBAQCBz dGF0aWMgdm9pZCBjbmxfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJYnJlYWs7CiAJfQogCi0Jc3dpdGNoIChjZGNsaykgewotCWNhc2UgNTI4MDAwOgotCQlw Y3VfYWNrID0gMjsKLQkJYnJlYWs7Ci0JY2FzZSAzMzYwMDA6Ci0JCXBjdV9hY2sgPSAxOwotCQli cmVhazsKLQljYXNlIDE2ODAwMDoKLQlkZWZhdWx0OgotCQlwY3VfYWNrID0gMDsKLQkJYnJlYWs7 Ci0JfQotCiAJaWYgKGRldl9wcml2LT5jZGNsay5ody52Y28gIT0gMCAmJgogCSAgICBkZXZfcHJp di0+Y2RjbGsuaHcudmNvICE9IHZjbykKIAkJY25sX2NkY2xrX3BsbF9kaXNhYmxlKGRldl9wcml2 KTsKQEAgLTE2NTQsNyArMTY2MSw4IEBAIHN0YXRpYyB2b2lkIGNubF9zZXRfY2RjbGsoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJLyogaW5mb3JtIFBDVSBvZiB0aGUgY2hh bmdlICovCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKLQlzYW5keWJyaWRnZV9w Y29kZV93cml0ZShkZXZfcHJpdiwgU0tMX1BDT0RFX0NEQ0xLX0NPTlRST0wsIHBjdV9hY2spOwor CXNhbmR5YnJpZGdlX3Bjb2RlX3dyaXRlKGRldl9wcml2LCBTS0xfUENPREVfQ0RDTEtfQ09OVFJP TCwKKwkJCQljZGNsa19zdGF0ZS0+dm9sdGFnZSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ cGN1X2xvY2spOwogCiAJaW50ZWxfdXBkYXRlX2NkY2xrKGRldl9wcml2KTsKQEAgLTE3NDcsNiAr MTc1NSw3IEBAIHZvaWQgY25sX2luaXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCiAJY2RjbGtfc3RhdGUuY2RjbGsgPSBjbmxfY2FsY19jZGNsaygwKTsKIAljZGNs a19zdGF0ZS52Y28gPSBjbmxfY2RjbGtfcGxsX3ZjbyhkZXZfcHJpdiwgY2RjbGtfc3RhdGUuY2Rj bGspOworCWNkY2xrX3N0YXRlLnZvbHRhZ2UgPSBjbmxfY2FsY192b2x0YWdlKGNkY2xrX3N0YXRl LmNkY2xrKTsKIAogCWNubF9zZXRfY2RjbGsoZGV2X3ByaXYsICZjZGNsa19zdGF0ZSk7CiB9CkBA IC0xNzY0LDYgKzE3NzMsNyBAQCB2b2lkIGNubF91bmluaXRfY2RjbGsoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCiAJY2RjbGtfc3RhdGUuY2RjbGsgPSBjZGNsa19zdGF0ZS5y ZWY7CiAJY2RjbGtfc3RhdGUudmNvID0gMDsKKwljZGNsa19zdGF0ZS52b2x0YWdlID0gY25sX2Nh bGNfdm9sdGFnZShjZGNsa19zdGF0ZS5jZGNsayk7CiAKIAljbmxfc2V0X2NkY2xrKGRldl9wcml2 LCAmY2RjbGtfc3RhdGUpOwogfQpAQCAtMjA4MSw2ICsyMDkxLDcgQEAgc3RhdGljIGludCBjbmxf bW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAogCWlu dGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsLnZjbyA9IHZjbzsKIAlpbnRlbF9zdGF0ZS0+Y2RjbGsu bG9naWNhbC5jZGNsayA9IGNkY2xrOworCWludGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsLnZvbHRh Z2UgPSBjbmxfY2FsY192b2x0YWdlKGNkY2xrKTsKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2 ZV9jcnRjcykgewogCQljZGNsayA9IGNubF9jYWxjX2NkY2xrKDApOwpAQCAtMjA4OCw2ICsyMDk5 LDcgQEAgc3RhdGljIGludCBjbmxfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIAogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZjbyA9IHZjbzsK IAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsayA9IGNkY2xrOworCQlpbnRlbF9zdGF0 ZS0+Y2RjbGsuYWN0dWFsLnZvbHRhZ2UgPSBjbmxfY2FsY192b2x0YWdlKGNkY2xrKTsKIAl9IGVs c2UgewogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsID0KIAkJCWludGVsX3N0YXRlLT5jZGNs ay5sb2dpY2FsOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK