From: Ville Syrjala Subject: [PATCH v2 05/10] drm/i915: Use cdclk_state->voltage on SKL/KBL/CFL Date: Tue, 24 Oct 2017 12:52:11 +0300 Message-ID: <20171024095216.1638-6-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B7E46E41C for ; Tue, 24 Oct 2017 09:52:37 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRy YWNrIHRoZSBzeXN0ZW0gYWdlbnQgdm9sdGFnZSB3ZSByZXF1ZXN0IGZyb20gcGNvZGUgaW4gdGhl IGNkY2xrIHN0YXRlCm9uIFNLTC9LQkwvQ0ZMLiBBbm5veWluZ2x5IHdlIGNhbid0IGFjdHVhbGx5 IHJlYWQgb3V0IHRoZSBjdXJyZW50IHZhbHVlIHNpbmNlCnRoZXJlJ3Mgbm8gcGNvZGUgY29tbWFu ZCB0byBkbyB0aGF0LCBzbyB3ZSdsbCBoYXZlIHRvIGp1c3QgYXNzdW1lIHRoYXQKaXQgd29ya2Vk LgoKdjI6IHMvdm9sdGFnZS92b2x0YWdlX2xldmVsLyAoUm9kcmlnbykKCkNjOiBNaWthIEthaG9s YSA8bWlrYS5rYWhvbGFAaW50ZWwuY29tPgpDYzogTWFuYXNpIE5hdmFyZSA8bWFuYXNpLmQubmF2 YXJlQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KUmV2aWV3ZWQtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIHwgNDMgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25z KCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NkY2xrLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IGM5 OGZlYzMzM2RkMS4uMzhlMzFkZjI2NWJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMK QEAgLTc4NSw2ICs3ODUsMjQgQEAgc3RhdGljIGludCBza2xfY2FsY19jZGNsayhpbnQgbWluX2Nk Y2xrLCBpbnQgdmNvKQogCX0KIH0KIAorc3RhdGljIHU4IHNrbF9jYWxjX3ZvbHRhZ2VfbGV2ZWwo aW50IGNkY2xrKQoreworCXN3aXRjaCAoY2RjbGspIHsKKwlkZWZhdWx0OgorCWNhc2UgMzA4NTcx OgorCWNhc2UgMzM3NTAwOgorCQlyZXR1cm4gMDsKKwljYXNlIDQ1MDAwMDoKKwljYXNlIDQzMjAw MDoKKwkJcmV0dXJuIDE7CisJY2FzZSA1NDAwMDA6CisJCXJldHVybiAyOworCWNhc2UgNjE3MTQz OgorCWNhc2UgNjc1MDAwOgorCQlyZXR1cm4gMzsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIHNrbF9k cGxsMF91cGRhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICBz dHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgKmNkY2xrX3N0YXRlKQogewpAQCAtODM1LDcgKzg1Myw3 IEBAIHN0YXRpYyB2b2lkIHNrbF9nZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCWNkY2xrX3N0YXRlLT5jZGNsayA9IGNkY2xrX3N0YXRlLT5yZWY7CiAKIAlpZiAo Y2RjbGtfc3RhdGUtPnZjbyA9PSAwKQotCQlyZXR1cm47CisJCWdvdG8gb3V0OwogCiAJY2RjdGwg PSBJOTE1X1JFQUQoQ0RDTEtfQ1RMKTsKIApAQCAtODc2LDYgKzg5NCwxNCBAQCBzdGF0aWMgdm9p ZCBza2xfZ2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCWJy ZWFrOwogCQl9CiAJfQorCisgb3V0OgorCS8qCisJICogQ2FuJ3QgcmVhZCB0aGlzIG91dCA6KCBM ZXQncyBhc3N1bWUgaXQncworCSAqIGF0IGxlYXN0IHdoYXQgdGhlIENEQ0xLIGZyZXF1ZW5jeSBy ZXF1aXJlcy4KKwkgKi8KKwljZGNsa19zdGF0ZS0+dm9sdGFnZV9sZXZlbCA9CisJCXNrbF9jYWxj X3ZvbHRhZ2VfbGV2ZWwoY2RjbGtfc3RhdGUtPmNkY2xrKTsKIH0KIAogLyogY29udmVydCBmcm9t IGtIeiB0byAuMSBmaXhwb2ludCBNSHogd2l0aCAtMU1IeiBvZmZzZXQgKi8KQEAgLTk2MCw3ICs5 ODYsNyBAQCBzdGF0aWMgdm9pZCBza2xfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIHsKIAlpbnQgY2RjbGsgPSBjZGNsa19zdGF0ZS0+Y2RjbGs7CiAJaW50IHZj byA9IGNkY2xrX3N0YXRlLT52Y287Ci0JdTMyIGZyZXFfc2VsZWN0LCBwY3VfYWNrOworCXUzMiBm cmVxX3NlbGVjdDsKIAlpbnQgcmV0OwogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBjdV9sb2Nr KTsKQEAgLTk4NCwyMSArMTAxMCwxNyBAQCBzdGF0aWMgdm9pZCBza2xfc2V0X2NkY2xrKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAljYXNlIDMwODU3MToKIAljYXNlIDMzNzUw MDoKIAkJZnJlcV9zZWxlY3QgPSBDRENMS19GUkVRXzMzN18zMDg7Ci0JCXBjdV9hY2sgPSAwOwog CQlicmVhazsKIAljYXNlIDQ1MDAwMDoKIAljYXNlIDQzMjAwMDoKIAkJZnJlcV9zZWxlY3QgPSBD RENMS19GUkVRXzQ1MF80MzI7Ci0JCXBjdV9hY2sgPSAxOwogCQlicmVhazsKIAljYXNlIDU0MDAw MDoKIAkJZnJlcV9zZWxlY3QgPSBDRENMS19GUkVRXzU0MDsKLQkJcGN1X2FjayA9IDI7CiAJCWJy ZWFrOwogCWNhc2UgNjE3MTQzOgogCWNhc2UgNjc1MDAwOgogCQlmcmVxX3NlbGVjdCA9IENEQ0xL X0ZSRVFfNjc1XzYxNzsKLQkJcGN1X2FjayA9IDM7CiAJCWJyZWFrOwogCX0KIApAQCAtMTAxNCw3 ICsxMDM2LDggQEAgc3RhdGljIHZvaWQgc2tsX3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAKIAkvKiBpbmZvcm0gUENVIG9mIHRoZSBjaGFuZ2UgKi8KIAltdXRl eF9sb2NrKCZkZXZfcHJpdi0+cGN1X2xvY2spOwotCXNhbmR5YnJpZGdlX3Bjb2RlX3dyaXRlKGRl dl9wcml2LCBTS0xfUENPREVfQ0RDTEtfQ09OVFJPTCwgcGN1X2Fjayk7CisJc2FuZHlicmlkZ2Vf cGNvZGVfd3JpdGUoZGV2X3ByaXYsIFNLTF9QQ09ERV9DRENMS19DT05UUk9MLAorCQkJCWNkY2xr X3N0YXRlLT52b2x0YWdlX2xldmVsKTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5wY3VfbG9j ayk7CiAKIAlpbnRlbF91cGRhdGVfY2RjbGsoZGV2X3ByaXYpOwpAQCAtMTA5Myw2ICsxMTE2LDcg QEAgdm9pZCBza2xfaW5pdF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJaWYgKGNkY2xrX3N0YXRlLnZjbyA9PSAwKQogCQljZGNsa19zdGF0ZS52Y28gPSA4MTAwMDAw OwogCWNkY2xrX3N0YXRlLmNkY2xrID0gc2tsX2NhbGNfY2RjbGsoMCwgY2RjbGtfc3RhdGUudmNv KTsKKwljZGNsa19zdGF0ZS52b2x0YWdlX2xldmVsID0gc2tsX2NhbGNfdm9sdGFnZV9sZXZlbChj ZGNsa19zdGF0ZS5jZGNsayk7CiAKIAlza2xfc2V0X2NkY2xrKGRldl9wcml2LCAmY2RjbGtfc3Rh dGUpOwogfQpAQCAtMTExMCw2ICsxMTM0LDcgQEAgdm9pZCBza2xfdW5pbml0X2NkY2xrKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCWNkY2xrX3N0YXRlLmNkY2xrID0gY2Rj bGtfc3RhdGUucmVmOwogCWNkY2xrX3N0YXRlLnZjbyA9IDA7CisJY2RjbGtfc3RhdGUudm9sdGFn ZV9sZXZlbCA9IHNrbF9jYWxjX3ZvbHRhZ2VfbGV2ZWwoY2RjbGtfc3RhdGUuY2RjbGspOwogCiAJ c2tsX3NldF9jZGNsayhkZXZfcHJpdiwgJmNkY2xrX3N0YXRlKTsKIH0KQEAgLTE5NjgsMTIgKzE5 OTMsMTYgQEAgc3RhdGljIGludCBza2xfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSkKIAogCWludGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsLnZjbyA9IHZj bzsKIAlpbnRlbF9zdGF0ZS0+Y2RjbGsubG9naWNhbC5jZGNsayA9IGNkY2xrOworCWludGVsX3N0 YXRlLT5jZGNsay5sb2dpY2FsLnZvbHRhZ2VfbGV2ZWwgPQorCQlza2xfY2FsY192b2x0YWdlX2xl dmVsKGNkY2xrKTsKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcykgewogCQljZGNs ayA9IHNrbF9jYWxjX2NkY2xrKDAsIHZjbyk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVh bC52Y28gPSB2Y287CiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsK KwkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52b2x0YWdlX2xldmVsID0KKwkJCXNrbF9jYWxj X3ZvbHRhZ2VfbGV2ZWwoY2RjbGspOwogCX0gZWxzZSB7CiAJCWludGVsX3N0YXRlLT5jZGNsay5h Y3R1YWwgPQogCQkJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWw7Ci0tIAoyLjEzLjYKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=