From: Ville Syrjala Subject: [PATCH v3 3/8] drm/i915: Use cdclk_state->voltage on VLV/CHV Date: Fri, 20 Oct 2017 20:03:19 +0300 Message-ID: <20171020170319.24910-1-ville.syrjala@linux.intel.com> References: <20171018204825.2500-4-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC4386E1B3 for ; Fri, 20 Oct 2017 17:03:25 +0000 (UTC) In-Reply-To: <20171018204825.2500-4-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 YW5pdHkgY2hlY2sgaW4gdmx2X3NldF9jZGNsaygpIChSb2RyaWdvKQoKQ2M6IE1pa2EgS2Fob2xh IDxtaWthLmthaG9sYUBpbnRlbC5jb20+CkNjOiBNYW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZh cmVAaW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgfCA1NCArKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM4IGluc2VydGlvbnMo KyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NkY2xrLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IDUy MjIyMmY4YmI1MC4uZTJmMTg1NDVkMjBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMK QEAgLTQzNywxMyArNDM3LDQ1IEBAIHN0YXRpYyBpbnQgdmx2X2NhbGNfY2RjbGsoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgbWluX2NkY2xrKQogCQlyZXR1cm4gMjAwMDAw OwogfQogCitzdGF0aWMgdTggdmx2X2NhbGNfdm9sdGFnZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGludCBjZGNsaykKK3sKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikp IHsKKwkJaWYgKGNkY2xrID49IDMyMDAwMCkgLyoganVtcCB0byBoaWdoZXN0IHZvbHRhZ2UgZm9y IDQwME1IeiB0b28gKi8KKwkJCXJldHVybiAyOworCQllbHNlIGlmIChjZGNsayA+PSAyNjY2Njcp CisJCQlyZXR1cm4gMTsKKwkJZWxzZQorCQkJcmV0dXJuIDA7CisJfSBlbHNlIHsKKwkJLyoKKwkJ ICogU3BlY3MgYXJlIGZ1bGwgb2YgbWlzaW5mb3JtYXRpb24sIGJ1dCB0ZXN0aW5nIG9uIGFjdHVh bAorCQkgKiBoYXJkd2FyZSBoYXMgc2hvd24gdGhhdCB3ZSBqdXN0IG5lZWQgdG8gd3JpdGUgdGhl IGRlc2lyZWQKKwkJICogQ0NLIGRpdmlkZXIgaW50byB0aGUgUHVuaXQgcmVnaXN0ZXIuCisJCSAq LworCQlyZXR1cm4gRElWX1JPVU5EX0NMT1NFU1QoZGV2X3ByaXYtPmhwbGxfZnJlcSA8PCAxLCBj ZGNsaykgLSAxOworCX0KK30KKwogc3RhdGljIHZvaWQgdmx2X2dldF9jZGNsayhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgIHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAq Y2RjbGtfc3RhdGUpCiB7CisJdTMyIHZhbDsKKwogCWNkY2xrX3N0YXRlLT52Y28gPSB2bHZfZ2V0 X2hwbGxfdmNvKGRldl9wcml2KTsKIAljZGNsa19zdGF0ZS0+Y2RjbGsgPSB2bHZfZ2V0X2Nja19j bG9jayhkZXZfcHJpdiwgImNkY2xrIiwKIAkJCQkJICAgICAgIENDS19ESVNQTEFZX0NMT0NLX0NP TlRST0wsCiAJCQkJCSAgICAgICBjZGNsa19zdGF0ZS0+dmNvKTsKKworCW11dGV4X2xvY2soJmRl dl9wcml2LT5wY3VfbG9jayk7CisJdmFsID0gdmx2X3B1bml0X3JlYWQoZGV2X3ByaXYsIFBVTklU X1JFR19EU1BGUkVRKTsKKwltdXRleF91bmxvY2soJmRldl9wcml2LT5wY3VfbG9jayk7CisKKwlp ZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpCisJCWNkY2xrX3N0YXRlLT52b2x0YWdlID0gKHZh bCAmIERTUEZSRVFHVUFSX01BU0spID4+CisJCQlEU1BGUkVRR1VBUl9TSElGVDsKKwllbHNlCisJ CWNkY2xrX3N0YXRlLT52b2x0YWdlID0gKHZhbCAmIERTUEZSRVFHVUFSX01BU0tfQ0hWKSA+Pgor CQkJRFNQRlJFUUdVQVJfU0hJRlRfQ0hWOwogfQogCiBzdGF0aWMgdm9pZCB2bHZfcHJvZ3JhbV9w ZmlfY3JlZGl0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC00ODYsNyAr NTE4LDcgQEAgc3RhdGljIHZvaWQgdmx2X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtf c3RhdGUpCiB7CiAJaW50IGNkY2xrID0gY2RjbGtfc3RhdGUtPmNkY2xrOwotCXUzMiB2YWwsIGNt ZDsKKwl1MzIgdmFsLCBjbWQgPSBjZGNsa19zdGF0ZS0+dm9sdGFnZTsKIAogCS8qIFRoZXJlIGFy ZSBjYXNlcyB3aGVyZSB3ZSBjYW4gZW5kIHVwIGhlcmUgd2l0aCBwb3dlciBkb21haW5zCiAJICog b2ZmIGFuZCBhIENEQ0xLIGZyZXF1ZW5jeSBvdGhlciB0aGFuIHRoZSBtaW5pbXVtLCBsaWtlIHdo ZW4KQEAgLTQ5NiwxMyArNTI4LDYgQEAgc3RhdGljIHZvaWQgdmx2X3NldF9jZGNsayhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJICovCiAJaW50ZWxfZGlzcGxheV9wb3dlcl9n ZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QSVBFX0EpOwogCi0JaWYgKGNkY2xrID49IDMyMDAw MCkgLyoganVtcCB0byBoaWdoZXN0IHZvbHRhZ2UgZm9yIDQwME1IeiB0b28gKi8KLQkJY21kID0g MjsKLQllbHNlIGlmIChjZGNsayA9PSAyNjY2NjcpCi0JCWNtZCA9IDE7Ci0JZWxzZQotCQljbWQg PSAwOwotCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKIAl2YWwgPSB2bHZfcHVu aXRfcmVhZChkZXZfcHJpdiwgUFVOSVRfUkVHX0RTUEZSRVEpOwogCXZhbCAmPSB+RFNQRlJFUUdV QVJfTUFTSzsKQEAgLTU2Miw3ICs1ODcsNyBAQCBzdGF0aWMgdm9pZCBjaHZfc2V0X2NkY2xrKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgY29uc3Qgc3RydWN0IGludGVs X2NkY2xrX3N0YXRlICpjZGNsa19zdGF0ZSkKIHsKIAlpbnQgY2RjbGsgPSBjZGNsa19zdGF0ZS0+ Y2RjbGs7Ci0JdTMyIHZhbCwgY21kOworCXUzMiB2YWwsIGNtZCA9IGNkY2xrX3N0YXRlLT52b2x0 YWdlOwogCiAJc3dpdGNoIChjZGNsaykgewogCWNhc2UgMzMzMzMzOgpAQCAtNTgzLDEzICs2MDgs NiBAQCBzdGF0aWMgdm9pZCBjaHZfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkgKi8KIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgUE9XRVJf RE9NQUlOX1BJUEVfQSk7CiAKLQkvKgotCSAqIFNwZWNzIGFyZSBmdWxsIG9mIG1pc2luZm9ybWF0 aW9uLCBidXQgdGVzdGluZyBvbiBhY3R1YWwKLQkgKiBoYXJkd2FyZSBoYXMgc2hvd24gdGhhdCB3 ZSBqdXN0IG5lZWQgdG8gd3JpdGUgdGhlIGRlc2lyZWQKLQkgKiBDQ0sgZGl2aWRlciBpbnRvIHRo ZSBQdW5pdCByZWdpc3Rlci4KLQkgKi8KLQljbWQgPSBESVZfUk9VTkRfQ0xPU0VTVChkZXZfcHJp di0+aHBsbF9mcmVxIDw8IDEsIGNkY2xrKSAtIDE7Ci0KIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ cGN1X2xvY2spOwogCXZhbCA9IHZsdl9wdW5pdF9yZWFkKGRldl9wcml2LCBQVU5JVF9SRUdfRFNQ RlJFUSk7CiAJdmFsICY9IH5EU1BGUkVRR1VBUl9NQVNLX0NIVjsKQEAgLTE4NTksMTEgKzE4Nzcs MTUgQEAgc3RhdGljIGludCB2bHZfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIAljZGNsayA9IHZsdl9jYWxjX2NkY2xrKGRldl9wcml2LCBtaW5fY2Rj bGspOwogCiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwuY2RjbGsgPSBjZGNsazsKKwlpbnRl bF9zdGF0ZS0+Y2RjbGsubG9naWNhbC52b2x0YWdlID0KKwkJdmx2X2NhbGNfdm9sdGFnZShkZXZf cHJpdiwgY2RjbGspOwogCiAJaWYgKCFpbnRlbF9zdGF0ZS0+YWN0aXZlX2NydGNzKSB7CiAJCWNk Y2xrID0gdmx2X2NhbGNfY2RjbGsoZGV2X3ByaXYsIDApOwogCiAJCWludGVsX3N0YXRlLT5jZGNs ay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKKwkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52b2x0 YWdlID0KKwkJCXZsdl9jYWxjX3ZvbHRhZ2UoZGV2X3ByaXYsIGNkY2xrKTsKIAl9IGVsc2Ugewog CQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsID0KIAkJCWludGVsX3N0YXRlLT5jZGNsay5sb2dp Y2FsOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK