From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 3/8] drm/i915: USe cdclk_state->voltage on VLV/CHV Date: Wed, 18 Oct 2017 23:48:20 +0300 Message-ID: <20171018204825.2500-4-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id A16596E941 for ; Wed, 18 Oct 2017 20:48:39 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClN0 b3JlIHRoZSBwdW5pdCBEU1BGUkVRVUFSIHZhbHVlIGludG8gY2RjbGtfc3RhdGUtPnZvbHRhZ2Ug b24KVkxWL0NIVi4gU2luY2Ugd2UgY2FuIGFjdHVhbGx5IHJlYWQgdGhhdCBvdXQgZnJvbSB0aGUg aGFyZHdhcmUKdGhpcyBjYW4gZ2l2ZSB1cyBhIGJpdCBtb3JlIGNyb3NzIGNoZWNraW5nIGJldHdl ZW4gdGhlIGhhcmR3YXJlCmFuZCBzb2Z0d2FyZSBzdGF0ZS4KCkNjOiBNaWthIEthaG9sYSA8bWlr YS5rYWhvbGFAaW50ZWwuY29tPgpDYzogTWFuYXNpIE5hdmFyZSA8bWFuYXNpLmQubmF2YXJlQGlu dGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIHwgNTMgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRpb25z KCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9jZGNsay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYwppbmRleCA1 MjIyMjJmOGJiNTAuLmRmNzE2NjdjOWZkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5j CkBAIC00MzcsMTMgKzQzNyw0NSBAQCBzdGF0aWMgaW50IHZsdl9jYWxjX2NkY2xrKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IG1pbl9jZGNsaykKIAkJcmV0dXJuIDIwMDAw MDsKIH0KIAorc3RhdGljIHU4IHZsdl9jYWxjX3ZvbHRhZ2Uoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCBpbnQgY2RjbGspCit7CisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYp KSB7CisJCWlmIChjZGNsayA+PSAzMjAwMDApIC8qIGp1bXAgdG8gaGlnaGVzdCB2b2x0YWdlIGZv ciA0MDBNSHogdG9vICovCisJCQlyZXR1cm4gMjsKKwkJZWxzZSBpZiAoY2RjbGsgPj0gMjY2NjY3 KQorCQkJcmV0dXJuIDE7CisJCWVsc2UKKwkJCXJldHVybiAwOworCX0gZWxzZSB7CisJCS8qCisJ CSAqIFNwZWNzIGFyZSBmdWxsIG9mIG1pc2luZm9ybWF0aW9uLCBidXQgdGVzdGluZyBvbiBhY3R1 YWwKKwkJICogaGFyZHdhcmUgaGFzIHNob3duIHRoYXQgd2UganVzdCBuZWVkIHRvIHdyaXRlIHRo ZSBkZXNpcmVkCisJCSAqIENDSyBkaXZpZGVyIGludG8gdGhlIFB1bml0IHJlZ2lzdGVyLgorCQkg Ki8KKwkJcmV0dXJuIERJVl9ST1VORF9DTE9TRVNUKGRldl9wcml2LT5ocGxsX2ZyZXEgPDwgMSwg Y2RjbGspIC0gMTsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIHZsdl9nZXRfY2RjbGsoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICBzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUg KmNkY2xrX3N0YXRlKQogeworCXUzMiB2YWw7CisKIAljZGNsa19zdGF0ZS0+dmNvID0gdmx2X2dl dF9ocGxsX3ZjbyhkZXZfcHJpdik7CiAJY2RjbGtfc3RhdGUtPmNkY2xrID0gdmx2X2dldF9jY2tf Y2xvY2soZGV2X3ByaXYsICJjZGNsayIsCiAJCQkJCSAgICAgICBDQ0tfRElTUExBWV9DTE9DS19D T05UUk9MLAogCQkJCQkgICAgICAgY2RjbGtfc3RhdGUtPnZjbyk7CisKKwltdXRleF9sb2NrKCZk ZXZfcHJpdi0+cGN1X2xvY2spOworCXZhbCA9IHZsdl9wdW5pdF9yZWFkKGRldl9wcml2LCBQVU5J VF9SRUdfRFNQRlJFUSk7CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cGN1X2xvY2spOworCisJ aWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQorCQljZGNsa19zdGF0ZS0+dm9sdGFnZSA9ICh2 YWwgJiBEU1BGUkVRR1VBUl9NQVNLKSA+PgorCQkJRFNQRlJFUUdVQVJfU0hJRlQ7CisJZWxzZQor CQljZGNsa19zdGF0ZS0+dm9sdGFnZSA9ICh2YWwgJiBEU1BGUkVRR1VBUl9NQVNLX0NIVikgPj4K KwkJCURTUEZSRVFHVUFSX1NISUZUX0NIVjsKIH0KIAogc3RhdGljIHZvaWQgdmx2X3Byb2dyYW1f cGZpX2NyZWRpdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtNDk2LDIw ICs1MjgsMTUgQEAgc3RhdGljIHZvaWQgdmx2X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJICovCiAJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYs IFBPV0VSX0RPTUFJTl9QSVBFX0EpOwogCi0JaWYgKGNkY2xrID49IDMyMDAwMCkgLyoganVtcCB0 byBoaWdoZXN0IHZvbHRhZ2UgZm9yIDQwME1IeiB0b28gKi8KLQkJY21kID0gMjsKLQllbHNlIGlm IChjZGNsayA9PSAyNjY2NjcpCi0JCWNtZCA9IDE7Ci0JZWxzZQotCQljbWQgPSAwOworCWNtZCA9 IGNkY2xrX3N0YXRlLT52b2x0YWdlIDw8IERTUEZSRVFHVUFSX1NISUZUOwogCiAJbXV0ZXhfbG9j aygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKIAl2YWwgPSB2bHZfcHVuaXRfcmVhZChkZXZfcHJpdiwg UFVOSVRfUkVHX0RTUEZSRVEpOwogCXZhbCAmPSB+RFNQRlJFUUdVQVJfTUFTSzsKLQl2YWwgfD0g KGNtZCA8PCBEU1BGUkVRR1VBUl9TSElGVCk7CisJdmFsIHw9IGNtZDsKIAl2bHZfcHVuaXRfd3Jp dGUoZGV2X3ByaXYsIFBVTklUX1JFR19EU1BGUkVRLCB2YWwpOwogCWlmICh3YWl0X2Zvcigodmx2 X3B1bml0X3JlYWQoZGV2X3ByaXYsIFBVTklUX1JFR19EU1BGUkVRKSAmCi0JCSAgICAgIERTUEZS RVFTVEFUX01BU0spID09IChjbWQgPDwgRFNQRlJFUVNUQVRfU0hJRlQpLAorCQkgICAgICBEU1BG UkVRU1RBVF9NQVNLKSA9PSBjbWQsCiAJCSAgICAgNTApKSB7CiAJCURSTV9FUlJPUigidGltZWQg b3V0IHdhaXRpbmcgZm9yIENEY2xrIGNoYW5nZVxuIik7CiAJfQpAQCAtNTg4LDE1ICs2MTUsMTUg QEAgc3RhdGljIHZvaWQgY2h2X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJICogaGFyZHdhcmUgaGFzIHNob3duIHRoYXQgd2UganVzdCBuZWVkIHRvIHdyaXRl IHRoZSBkZXNpcmVkCiAJICogQ0NLIGRpdmlkZXIgaW50byB0aGUgUHVuaXQgcmVnaXN0ZXIuCiAJ ICovCi0JY21kID0gRElWX1JPVU5EX0NMT1NFU1QoZGV2X3ByaXYtPmhwbGxfZnJlcSA8PCAxLCBj ZGNsaykgLSAxOworCWNtZCA9IGNkY2xrX3N0YXRlLT52b2x0YWdlIDw8IERTUEZSRVFHVUFSX1NI SUZUX0NIVjsKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT5wY3VfbG9jayk7CiAJdmFsID0gdmx2 X3B1bml0X3JlYWQoZGV2X3ByaXYsIFBVTklUX1JFR19EU1BGUkVRKTsKIAl2YWwgJj0gfkRTUEZS RVFHVUFSX01BU0tfQ0hWOwotCXZhbCB8PSAoY21kIDw8IERTUEZSRVFHVUFSX1NISUZUX0NIVik7 CisJdmFsIHw9IGNtZDsKIAl2bHZfcHVuaXRfd3JpdGUoZGV2X3ByaXYsIFBVTklUX1JFR19EU1BG UkVRLCB2YWwpOwogCWlmICh3YWl0X2Zvcigodmx2X3B1bml0X3JlYWQoZGV2X3ByaXYsIFBVTklU X1JFR19EU1BGUkVRKSAmCi0JCSAgICAgIERTUEZSRVFTVEFUX01BU0tfQ0hWKSA9PSAoY21kIDw8 IERTUEZSRVFTVEFUX1NISUZUX0NIViksCisJCSAgICAgIERTUEZSRVFTVEFUX01BU0tfQ0hWKSA9 PSBjbWQsCiAJCSAgICAgNTApKSB7CiAJCURSTV9FUlJPUigidGltZWQgb3V0IHdhaXRpbmcgZm9y IENEY2xrIGNoYW5nZVxuIik7CiAJfQpAQCAtMTg1OSwxMSArMTg4NiwxNSBAQCBzdGF0aWMgaW50 IHZsdl9tb2Rlc2V0X2NhbGNfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQog CWNkY2xrID0gdmx2X2NhbGNfY2RjbGsoZGV2X3ByaXYsIG1pbl9jZGNsayk7CiAKIAlpbnRlbF9z dGF0ZS0+Y2RjbGsubG9naWNhbC5jZGNsayA9IGNkY2xrOworCWludGVsX3N0YXRlLT5jZGNsay5s b2dpY2FsLnZvbHRhZ2UgPQorCQl2bHZfY2FsY192b2x0YWdlKGRldl9wcml2LCBjZGNsayk7CiAK IAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKIAkJY2RjbGsgPSB2bHZfY2FsY19j ZGNsayhkZXZfcHJpdiwgMCk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsayA9 IGNkY2xrOworCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZvbHRhZ2UgPQorCQkJdmx2X2Nh bGNfdm9sdGFnZShkZXZfcHJpdiwgY2RjbGspOwogCX0gZWxzZSB7CiAJCWludGVsX3N0YXRlLT5j ZGNsay5hY3R1YWwgPQogCQkJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWw7Ci0tIAoyLjEzLjYK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=