From: Ville Syrjala Subject: [PATCH v4 03/10] drm/i915: Use cdclk_state->voltage on VLV/CHV Date: Tue, 24 Oct 2017 12:52:09 +0300 Message-ID: <20171024095216.1638-4-ville.syrjala@linux.intel.com> References: <20171024095216.1638-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 12DBA6E413 for ; Tue, 24 Oct 2017 09:52:30 +0000 (UTC) In-Reply-To: <20171024095216.1638-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClN0 b3JlIHRoZSBwdW5pdCBEU1BGUkVRVUFSIHZhbHVlIGludG8gY2RjbGtfc3RhdGUtPnZvbHRhZ2Ug b24KVkxWL0NIVi4gU2luY2Ugd2UgY2FuIGFjdHVhbGx5IHJlYWQgdGhhdCBvdXQgZnJvbSB0aGUg aGFyZHdhcmUKdGhpcyBjYW4gZ2l2ZSB1cyBhIGJpdCBtb3JlIGNyb3NzIGNoZWNraW5nIGJldHdl ZW4gdGhlIGhhcmR3YXJlCmFuZCBzb2Z0d2FyZSBzdGF0ZS4KCnYyOiBEb24ndCBicmVhayB3YWl0 aW5nIGZvciBjZGNsayBjaGFuZ2Ugb24gVkxWL0NIVgp2MzogU3BsaXQgb3V0IHRoZSBjZGNsayBz YW5pdHkgY2hlY2sgaW4gdmx2X3NldF9jZGNsaygpIChSb2RyaWdvKQp2NDogcy92b2x0YWdlL3Zv bHRhZ2VfbGV2ZWwvIChSb2RyaWdvKQoKQ2M6IE1pa2EgS2Fob2xhIDxtaWthLmthaG9sYUBpbnRl bC5jb20+CkNjOiBNYW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwuY29tPgpDYzog Um9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxs ZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog Um9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NkY2xrLmMgfCA1NCArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IDZkYWQyZWZkNWUyNy4uOGJjMDkz MDgyNTExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKQEAgLTQzNywxMyArNDM3LDQ1 IEBAIHN0YXRpYyBpbnQgdmx2X2NhbGNfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LCBpbnQgbWluX2NkY2xrKQogCQlyZXR1cm4gMjAwMDAwOwogfQogCitzdGF0aWMgdTgg dmx2X2NhbGNfdm9sdGFnZV9sZXZlbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IGludCBjZGNsaykKK3sKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsKKwkJaWYgKGNk Y2xrID49IDMyMDAwMCkgLyoganVtcCB0byBoaWdoZXN0IHZvbHRhZ2UgZm9yIDQwME1IeiB0b28g Ki8KKwkJCXJldHVybiAyOworCQllbHNlIGlmIChjZGNsayA+PSAyNjY2NjcpCisJCQlyZXR1cm4g MTsKKwkJZWxzZQorCQkJcmV0dXJuIDA7CisJfSBlbHNlIHsKKwkJLyoKKwkJICogU3BlY3MgYXJl IGZ1bGwgb2YgbWlzaW5mb3JtYXRpb24sIGJ1dCB0ZXN0aW5nIG9uIGFjdHVhbAorCQkgKiBoYXJk d2FyZSBoYXMgc2hvd24gdGhhdCB3ZSBqdXN0IG5lZWQgdG8gd3JpdGUgdGhlIGRlc2lyZWQKKwkJ ICogQ0NLIGRpdmlkZXIgaW50byB0aGUgUHVuaXQgcmVnaXN0ZXIuCisJCSAqLworCQlyZXR1cm4g RElWX1JPVU5EX0NMT1NFU1QoZGV2X3ByaXYtPmhwbGxfZnJlcSA8PCAxLCBjZGNsaykgLSAxOwor CX0KK30KKwogc3RhdGljIHZvaWQgdmx2X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkgIHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtfc3RhdGUp CiB7CisJdTMyIHZhbDsKKwogCWNkY2xrX3N0YXRlLT52Y28gPSB2bHZfZ2V0X2hwbGxfdmNvKGRl dl9wcml2KTsKIAljZGNsa19zdGF0ZS0+Y2RjbGsgPSB2bHZfZ2V0X2Nja19jbG9jayhkZXZfcHJp diwgImNkY2xrIiwKIAkJCQkJICAgICAgIENDS19ESVNQTEFZX0NMT0NLX0NPTlRST0wsCiAJCQkJ CSAgICAgICBjZGNsa19zdGF0ZS0+dmNvKTsKKworCW11dGV4X2xvY2soJmRldl9wcml2LT5wY3Vf bG9jayk7CisJdmFsID0gdmx2X3B1bml0X3JlYWQoZGV2X3ByaXYsIFBVTklUX1JFR19EU1BGUkVR KTsKKwltdXRleF91bmxvY2soJmRldl9wcml2LT5wY3VfbG9jayk7CisKKwlpZiAoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikpCisJCWNkY2xrX3N0YXRlLT52b2x0YWdlX2xldmVsID0gKHZhbCAmIERT UEZSRVFHVUFSX01BU0spID4+CisJCQlEU1BGUkVRR1VBUl9TSElGVDsKKwllbHNlCisJCWNkY2xr X3N0YXRlLT52b2x0YWdlX2xldmVsID0gKHZhbCAmIERTUEZSRVFHVUFSX01BU0tfQ0hWKSA+Pgor CQkJRFNQRlJFUUdVQVJfU0hJRlRfQ0hWOwogfQogCiBzdGF0aWMgdm9pZCB2bHZfcHJvZ3JhbV9w ZmlfY3JlZGl0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC00ODYsNyAr NTE4LDcgQEAgc3RhdGljIHZvaWQgdmx2X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtf c3RhdGUpCiB7CiAJaW50IGNkY2xrID0gY2RjbGtfc3RhdGUtPmNkY2xrOwotCXUzMiB2YWwsIGNt ZDsKKwl1MzIgdmFsLCBjbWQgPSBjZGNsa19zdGF0ZS0+dm9sdGFnZV9sZXZlbDsKIAogCS8qIFRo ZXJlIGFyZSBjYXNlcyB3aGVyZSB3ZSBjYW4gZW5kIHVwIGhlcmUgd2l0aCBwb3dlciBkb21haW5z CiAJICogb2ZmIGFuZCBhIENEQ0xLIGZyZXF1ZW5jeSBvdGhlciB0aGFuIHRoZSBtaW5pbXVtLCBs aWtlIHdoZW4KQEAgLTQ5NiwxMyArNTI4LDYgQEAgc3RhdGljIHZvaWQgdmx2X3NldF9jZGNsayhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJICovCiAJaW50ZWxfZGlzcGxheV9w b3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QSVBFX0EpOwogCi0JaWYgKGNkY2xrID49 IDMyMDAwMCkgLyoganVtcCB0byBoaWdoZXN0IHZvbHRhZ2UgZm9yIDQwME1IeiB0b28gKi8KLQkJ Y21kID0gMjsKLQllbHNlIGlmIChjZGNsayA9PSAyNjY2NjcpCi0JCWNtZCA9IDE7Ci0JZWxzZQot CQljbWQgPSAwOwotCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKIAl2YWwgPSB2 bHZfcHVuaXRfcmVhZChkZXZfcHJpdiwgUFVOSVRfUkVHX0RTUEZSRVEpOwogCXZhbCAmPSB+RFNQ RlJFUUdVQVJfTUFTSzsKQEAgLTU2Miw3ICs1ODcsNyBAQCBzdGF0aWMgdm9pZCBjaHZfc2V0X2Nk Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgY29uc3Qgc3RydWN0 IGludGVsX2NkY2xrX3N0YXRlICpjZGNsa19zdGF0ZSkKIHsKIAlpbnQgY2RjbGsgPSBjZGNsa19z dGF0ZS0+Y2RjbGs7Ci0JdTMyIHZhbCwgY21kOworCXUzMiB2YWwsIGNtZCA9IGNkY2xrX3N0YXRl LT52b2x0YWdlX2xldmVsOwogCiAJc3dpdGNoIChjZGNsaykgewogCWNhc2UgMzMzMzMzOgpAQCAt NTgzLDEzICs2MDgsNiBAQCBzdGF0aWMgdm9pZCBjaHZfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkgKi8KIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZf cHJpdiwgUE9XRVJfRE9NQUlOX1BJUEVfQSk7CiAKLQkvKgotCSAqIFNwZWNzIGFyZSBmdWxsIG9m IG1pc2luZm9ybWF0aW9uLCBidXQgdGVzdGluZyBvbiBhY3R1YWwKLQkgKiBoYXJkd2FyZSBoYXMg c2hvd24gdGhhdCB3ZSBqdXN0IG5lZWQgdG8gd3JpdGUgdGhlIGRlc2lyZWQKLQkgKiBDQ0sgZGl2 aWRlciBpbnRvIHRoZSBQdW5pdCByZWdpc3Rlci4KLQkgKi8KLQljbWQgPSBESVZfUk9VTkRfQ0xP U0VTVChkZXZfcHJpdi0+aHBsbF9mcmVxIDw8IDEsIGNkY2xrKSAtIDE7Ci0KIAltdXRleF9sb2Nr KCZkZXZfcHJpdi0+cGN1X2xvY2spOwogCXZhbCA9IHZsdl9wdW5pdF9yZWFkKGRldl9wcml2LCBQ VU5JVF9SRUdfRFNQRlJFUSk7CiAJdmFsICY9IH5EU1BGUkVRR1VBUl9NQVNLX0NIVjsKQEAgLTE4 NTksMTEgKzE4NzcsMTUgQEAgc3RhdGljIGludCB2bHZfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAljZGNsayA9IHZsdl9jYWxjX2NkY2xrKGRldl9w cml2LCBtaW5fY2RjbGspOwogCiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwuY2RjbGsgPSBj ZGNsazsKKwlpbnRlbF9zdGF0ZS0+Y2RjbGsubG9naWNhbC52b2x0YWdlX2xldmVsID0KKwkJdmx2 X2NhbGNfdm9sdGFnZV9sZXZlbChkZXZfcHJpdiwgY2RjbGspOwogCiAJaWYgKCFpbnRlbF9zdGF0 ZS0+YWN0aXZlX2NydGNzKSB7CiAJCWNkY2xrID0gdmx2X2NhbGNfY2RjbGsoZGV2X3ByaXYsIDAp OwogCiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKKwkJaW50ZWxf c3RhdGUtPmNkY2xrLmFjdHVhbC52b2x0YWdlX2xldmVsID0KKwkJCXZsdl9jYWxjX3ZvbHRhZ2Vf bGV2ZWwoZGV2X3ByaXYsIGNkY2xrKTsKIAl9IGVsc2UgewogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsu YWN0dWFsID0KIAkJCWludGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsOwotLSAKMi4xMy42CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK