From: Ville Syrjala Subject: [PATCH 5/8] drm/i915: Use cdclk_state->voltage on SKL/KBL/CFL Date: Wed, 18 Oct 2017 23:48:22 +0300 Message-ID: <20171018204825.2500-6-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1162C6E955 for ; Wed, 18 Oct 2017 20:48:50 +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 IGNkY2xrIHN0YXRlCm9uIFNLTC9LQkwvQ0ZMLiBBbm5veWluZ2x5IHdlIGNhbid0IGFjdHVhbGx5 IHJlYWQgb3V0IHRoZSBjdXJyZW50IHZhbHVlIHNpbmNlCnRoZXJlJ3Mgbm8gcGNvZGUgY29tbWFu ZCB0byBkbyB0aGF0LCBzbyB3ZSdsbCBoYXZlIHRvIGp1c3QgYXNzdW1lIHRoYXQKaXQgd29ya2Vk LgoKQ2M6IE1pa2EgS2Fob2xhIDxtaWthLmthaG9sYUBpbnRlbC5jb20+CkNjOiBNYW5hc2kgTmF2 YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdv LnZpdmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nk Y2xrLmMgfCA0MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2NkY2xrLmMKaW5kZXggNzQ0MmU5NDQzZmZhLi42ZjdiNWFiZTZlM2YgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfY2RjbGsuYwpAQCAtNzg5LDYgKzc4OSwyNCBAQCBzdGF0aWMgaW50IHNr bF9jYWxjX2NkY2xrKGludCBtaW5fY2RjbGssIGludCB2Y28pCiAJfQogfQogCitzdGF0aWMgdTgg c2tsX2NhbGNfdm9sdGFnZShpbnQgY2RjbGspCit7CisJc3dpdGNoIChjZGNsaykgeworCWRlZmF1 bHQ6CisJY2FzZSAzMDg1NzE6CisJY2FzZSAzMzc1MDA6CisJCXJldHVybiAwOworCWNhc2UgNDUw MDAwOgorCWNhc2UgNDMyMDAwOgorCQlyZXR1cm4gMTsKKwljYXNlIDU0MDAwMDoKKwkJcmV0dXJu IDI7CisJY2FzZSA2MTcxNDM6CisJY2FzZSA2NzUwMDA6CisJCXJldHVybiAzOworCX0KK30KKwog c3RhdGljIHZvaWQgc2tsX2RwbGwwX3VwZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtfc3RhdGUpCiB7 CkBAIC04MzksNyArODU3LDcgQEAgc3RhdGljIHZvaWQgc2tsX2dldF9jZGNsayhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJY2RjbGtfc3RhdGUtPmNkY2xrID0gY2RjbGtfc3Rh dGUtPnJlZjsKIAogCWlmIChjZGNsa19zdGF0ZS0+dmNvID09IDApCi0JCXJldHVybjsKKwkJZ290 byBvdXQ7CiAKIAljZGN0bCA9IEk5MTVfUkVBRChDRENMS19DVEwpOwogCkBAIC04ODAsNiArODk4 LDEzIEBAIHN0YXRpYyB2b2lkIHNrbF9nZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJYnJlYWs7CiAJCX0KIAl9CisKKyBvdXQ6CisJLyoKKwkgKiBDYW4ndCBy ZWFkIHRoaXMgb3V0IDooIExldCdzIGFzc3VtZSBpdCdzCisJICogYXQgbGVhc3Qgd2hhdCB0aGUg Q0RDTEsgZnJlcXVlbmN5IHJlcXVpcmVzLgorCSAqLworCWNkY2xrX3N0YXRlLT52b2x0YWdlID0g c2tsX2NhbGNfdm9sdGFnZShjZGNsa19zdGF0ZS0+Y2RjbGspOwogfQogCiAvKiBjb252ZXJ0IGZy b20ga0h6IHRvIC4xIGZpeHBvaW50IE1IeiB3aXRoIC0xTUh6IG9mZnNldCAqLwpAQCAtOTY0LDcg Kzk4OSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9zZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogewogCWludCBjZGNsayA9IGNkY2xrX3N0YXRlLT5jZGNsazsKIAlpbnQg dmNvID0gY2RjbGtfc3RhdGUtPnZjbzsKLQl1MzIgZnJlcV9zZWxlY3QsIHBjdV9hY2s7CisJdTMy IGZyZXFfc2VsZWN0OwogCWludCByZXQ7CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+cGN1X2xv Y2spOwpAQCAtOTg4LDIxICsxMDEzLDE3IEBAIHN0YXRpYyB2b2lkIHNrbF9zZXRfY2RjbGsoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWNhc2UgMzA4NTcxOgogCWNhc2UgMzM3 NTAwOgogCQlmcmVxX3NlbGVjdCA9IENEQ0xLX0ZSRVFfMzM3XzMwODsKLQkJcGN1X2FjayA9IDA7 CiAJCWJyZWFrOwogCWNhc2UgNDUwMDAwOgogCWNhc2UgNDMyMDAwOgogCQlmcmVxX3NlbGVjdCA9 IENEQ0xLX0ZSRVFfNDUwXzQzMjsKLQkJcGN1X2FjayA9IDE7CiAJCWJyZWFrOwogCWNhc2UgNTQw MDAwOgogCQlmcmVxX3NlbGVjdCA9IENEQ0xLX0ZSRVFfNTQwOwotCQlwY3VfYWNrID0gMjsKIAkJ YnJlYWs7CiAJY2FzZSA2MTcxNDM6CiAJY2FzZSA2NzUwMDA6CiAJCWZyZXFfc2VsZWN0ID0gQ0RD TEtfRlJFUV82NzVfNjE3OwotCQlwY3VfYWNrID0gMzsKIAkJYnJlYWs7CiAJfQogCkBAIC0xMDE4 LDcgKzEwMzksOCBAQCBzdGF0aWMgdm9pZCBza2xfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAogCS8qIGluZm9ybSBQQ1Ugb2YgdGhlIGNoYW5nZSAqLwogCW11 dGV4X2xvY2soJmRldl9wcml2LT5wY3VfbG9jayk7Ci0Jc2FuZHlicmlkZ2VfcGNvZGVfd3JpdGUo ZGV2X3ByaXYsIFNLTF9QQ09ERV9DRENMS19DT05UUk9MLCBwY3VfYWNrKTsKKwlzYW5keWJyaWRn ZV9wY29kZV93cml0ZShkZXZfcHJpdiwgU0tMX1BDT0RFX0NEQ0xLX0NPTlRST0wsCisJCQkJY2Rj bGtfc3RhdGUtPnZvbHRhZ2UpOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsK IAogCWludGVsX3VwZGF0ZV9jZGNsayhkZXZfcHJpdik7CkBAIC0xMDk3LDYgKzExMTksNyBAQCB2 b2lkIHNrbF9pbml0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlp ZiAoY2RjbGtfc3RhdGUudmNvID09IDApCiAJCWNkY2xrX3N0YXRlLnZjbyA9IDgxMDAwMDA7CiAJ Y2RjbGtfc3RhdGUuY2RjbGsgPSBza2xfY2FsY19jZGNsaygwLCBjZGNsa19zdGF0ZS52Y28pOwor CWNkY2xrX3N0YXRlLnZvbHRhZ2UgPSBza2xfY2FsY192b2x0YWdlKGNkY2xrX3N0YXRlLmNkY2xr KTsKIAogCXNrbF9zZXRfY2RjbGsoZGV2X3ByaXYsICZjZGNsa19zdGF0ZSk7CiB9CkBAIC0xMTE0 LDYgKzExMzcsNyBAQCB2b2lkIHNrbF91bmluaXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCiAJY2RjbGtfc3RhdGUuY2RjbGsgPSBjZGNsa19zdGF0ZS5yZWY7CiAJ Y2RjbGtfc3RhdGUudmNvID0gMDsKKwljZGNsa19zdGF0ZS52b2x0YWdlID0gc2tsX2NhbGNfdm9s dGFnZShjZGNsa19zdGF0ZS5jZGNsayk7CiAKIAlza2xfc2V0X2NkY2xrKGRldl9wcml2LCAmY2Rj bGtfc3RhdGUpOwogfQpAQCAtMTk3MCwxMiArMTk5NCwxNCBAQCBzdGF0aWMgaW50IHNrbF9tb2Rl c2V0X2NhbGNfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCiAJaW50ZWxf c3RhdGUtPmNkY2xrLmxvZ2ljYWwudmNvID0gdmNvOwogCWludGVsX3N0YXRlLT5jZGNsay5sb2dp Y2FsLmNkY2xrID0gY2RjbGs7CisJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwudm9sdGFnZSA9 IHNrbF9jYWxjX3ZvbHRhZ2UoY2RjbGspOwogCiAJaWYgKCFpbnRlbF9zdGF0ZS0+YWN0aXZlX2Ny dGNzKSB7CiAJCWNkY2xrID0gc2tsX2NhbGNfY2RjbGsoMCwgdmNvKTsKIAogCQlpbnRlbF9zdGF0 ZS0+Y2RjbGsuYWN0dWFsLnZjbyA9IHZjbzsKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5j ZGNsayA9IGNkY2xrOworCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZvbHRhZ2UgPSBza2xf Y2FsY192b2x0YWdlKGNkY2xrKTsKIAl9IGVsc2UgewogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0 dWFsID0KIAkJCWludGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsOwotLSAKMi4xMy42CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK