From: Rodrigo Vivi Subject: [PATCH 12/12] drm/i915/cnl: Unify dvfs level selection. Date: Fri, 29 Sep 2017 17:08:50 -0700 Message-ID: <20170930000850.31332-13-rodrigo.vivi@intel.com> References: <20170930000850.31332-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A6E96E177 for ; Sat, 30 Sep 2017 00:09:01 +0000 (UTC) In-Reply-To: <20170930000850.31332-1-rodrigo.vivi@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: Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2hlbiBwb3J0IGNsb2NrIGlzIHplcm8gb3IgdW5kZWZpbmVkIHdlIGJhc2Ugb3VyCmNhbGN1bGF0 aW9uIG9uIGNkY2xrLiBTbywgc2FtZSBmdW5jdGlvbiBjYW4gYmUgdXNlZApmb3IgcG9ydCBjbG9j ayA9PSAwIG5vdyB0aGF0IHdlIGhhdmUgdGhlIHNhbWUgZGVmYXVsdCAiMiIuCgpDYzogTWlrYSBL YWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56 YW5vbmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2 aUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYyAgICB8 IDI4ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwbGxfbWdyLmMgfCAyNSArKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxNiBp bnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jZGNsay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsu YwppbmRleCBmMjYyOWRiZWM3NjMuLmIyYTFjMGM3YzkzOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jZGNsay5jCkBAIC0xNTQ0LDEyICsxNTQ0LDIyIEBAIGJvb2wgY25sX2R2ZnNfbmVlZF9jaGFu Z2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgbGV2ZWwpCiAJcmV0dXJu IGxldmVsICE9IG9sZF9sZXZlbDsKIH0KIAoraW50IGNubF9kdmZzX2dldF9sZXZlbChpbnQgY2Rj bGssIGludCBwb3J0Y2xrKQoreworCWlmIChjZGNsayA9PSAxNjgwMDAgJiYgcG9ydGNsayA8PSA1 OTQwMDApCisJCXJldHVybiAwOworCWVsc2UgaWYgKGNkY2xrID09IDMzNjAwMCAmJiBwb3J0Y2xr IDw9IDU5NDAwMCkKKwkJcmV0dXJuIDE7CisJZWxzZQorCQlyZXR1cm4gMjsKK30KKwogc3RhdGlj IHZvaWQgY25sX3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtfc3RhdGUpCiB7CiAJaW50 IGNkY2xrID0gY2RjbGtfc3RhdGUtPmNkY2xrOwogCWludCB2Y28gPSBjZGNsa19zdGF0ZS0+dmNv OwotCXUzMiB2YWwsIGRpdmlkZXIsIHBjdV9hY2s7CisJdTMyIHZhbCwgZGl2aWRlciwgbGV2ZWw7 CiAKIAlpZiAoY25sX2R2ZnNfcHJlX2NoYW5nZShkZXZfcHJpdikpCiAJCXJldHVybjsKQEAgLTE1 NzAsMTkgKzE1ODAsNiBAQCBzdGF0aWMgdm9pZCBjbmxfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJYnJlYWs7CiAJfQogCi0Jc3dpdGNoIChjZGNsaykgewot CWNhc2UgMTY4MDAwOgotCQlwY3VfYWNrID0gMDsKLQkJYnJlYWs7Ci0JY2FzZSAzMzYwMDA6Ci0J CXBjdV9hY2sgPSAxOwotCQlicmVhazsKLQljYXNlIDUyODAwMDoKLQlkZWZhdWx0OgotCQlwY3Vf YWNrID0gMjsKLQkJYnJlYWs7Ci0JfQotCiAJaWYgKGRldl9wcml2LT5jZGNsay5ody52Y28gIT0g MCAmJgogCSAgICBkZXZfcHJpdi0+Y2RjbGsuaHcudmNvICE9IHZjbykKIAkJY25sX2NkY2xrX3Bs bF9kaXNhYmxlKGRldl9wcml2KTsKQEAgLTE1OTksNyArMTU5Niw4IEBAIHN0YXRpYyB2b2lkIGNu bF9zZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCUk5MTVfV1JJ VEUoQ0RDTEtfQ1RMLCB2YWwpOwogCiAJLyogaW5mb3JtIFBDVSBvZiB0aGUgY2hhbmdlICovCi0J Y25sX2R2ZnNfcG9zdF9jaGFuZ2UoZGV2X3ByaXYsIHBjdV9hY2spOworCWxldmVsID0gY25sX2R2 ZnNfZ2V0X2xldmVsKGNkY2xrLCAwKTsKKwljbmxfZHZmc19wb3N0X2NoYW5nZShkZXZfcHJpdiwg bGV2ZWwpOwogCiAJaW50ZWxfdXBkYXRlX2NkY2xrKGRldl9wcml2KTsKIH0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcGxsX21nci5jCmluZGV4IDZiYmMzZDcxOGU3OC4uMTAwNmMyODUzOTk5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKQEAgLTE5NjYsMTYgKzE5NjYsNiBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RwbGxfbWdyIGJ4dF9wbGxfbWdyID0gewogCS5k dW1wX2h3X3N0YXRlID0gYnh0X2R1bXBfaHdfc3RhdGUsCiB9OwogCi1zdGF0aWMgaW50IGNubF9n ZXRfZHZmc19sZXZlbChpbnQgY2RjbGssIGludCBwb3J0Y2xrKQotewotCWlmIChjZGNsayA9PSAx NjgwMDAgJiYgcG9ydGNsayA8PSA1OTQwMDApCi0JCXJldHVybiAwOwotCWVsc2UgaWYgKGNkY2xr ID09IDMzNjAwMCAmJiBwb3J0Y2xrIDw9IDU5NDAwMCkKLQkJcmV0dXJuIDE7Ci0JZWxzZQotCQly ZXR1cm4gMjsKLX0KLQogc3RhdGljIHZvaWQgY25sX2RkaV9wbGxfZW5hYmxlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2Rw bGwgKnBsbCkKIHsKQEAgLTIwMjQsNyArMjAxNCw3IEBAIHN0YXRpYyB2b2lkIGNubF9kZGlfcGxs X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJICovCiAJY2RjbGsg PSBkZXZfcHJpdi0+Y2RjbGsuaHcuY2RjbGs7CiAJcG9ydGNsayA9IGludGVsX2RkaV9wb3J0X2Ns b2NrKGRldl9wcml2LCBwbGwtPmlkKTsKLQlsZXZlbCA9IGNubF9nZXRfZHZmc19sZXZlbChjZGNs aywgcG9ydGNsayk7CisJbGV2ZWwgPSBjbmxfZHZmc19nZXRfbGV2ZWwoY2RjbGssIHBvcnRjbGsp OwogCWNoYW5nZV9sZXZlbCA9IGNubF9kdmZzX25lZWRfY2hhbmdlKGRldl9wcml2LCBsZXZlbCk7 CiAJaWYgKGNoYW5nZV9sZXZlbCkKIAkJcmV0ID0gY25sX2R2ZnNfcHJlX2NoYW5nZShkZXZfcHJp dik7CkBAIC0yMDc1LDE4ICsyMDY1LDcgQEAgc3RhdGljIHZvaWQgY25sX2RkaV9wbGxfZGlzYWJs ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJICogKERWRlMpIFNlcXVlbmNl IEJlZm9yZSBGcmVxdWVuY3kgQ2hhbmdlCiAJICovCiAJY2RjbGsgPSBkZXZfcHJpdi0+Y2RjbGsu aHcuY2RjbGs7Ci0Jc3dpdGNoIChjZGNsaykgewotCWNhc2UgMTY4MDAwOgotCQlsZXZlbCA9IDA7 Ci0JCWJyZWFrOwotCWNhc2UgMzM2MDAwOgotCQlsZXZlbCA9IDE7Ci0JCWJyZWFrOwotCWNhc2Ug NTI4MDAwOgotCWRlZmF1bHQ6Ci0JCWxldmVsID0gMjsKLQkJYnJlYWs7Ci0JfQorCWxldmVsID0g Y25sX2R2ZnNfZ2V0X2xldmVsKGNkY2xrLCAwKTsKIAljaGFuZ2VfbGV2ZWwgPSBjbmxfZHZmc19u ZWVkX2NoYW5nZShkZXZfcHJpdiwgbGV2ZWwpOwogCWlmIChjaGFuZ2VfbGV2ZWwpCiAJCXJldCA9 IGNubF9kdmZzX3ByZV9jaGFuZ2UoZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp bmRleCAyMDAwNjFkZWY0OGUuLmMxMzk1ZThhNmJhNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKQEAgLTEzMjYsNiArMTMyNiw3IEBAIHZvaWQgY25sX3VuaW5pdF9jZGNsayhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGNubF9kdmZzX3ByZV9jaGFuZ2Uoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgY25sX2R2ZnNfcG9zdF9jaGFuZ2Uo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgbGV2ZWwpOwogYm9vbCBjbmxf ZHZmc19uZWVkX2NoYW5nZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBs ZXZlbCk7CitpbnQgY25sX2R2ZnNfZ2V0X2xldmVsKGludCBjZGNsaywgaW50IHBvcnRjbGspOwog dm9pZCBieHRfaW5pdF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwog dm9pZCBieHRfdW5pbml0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiB2b2lkIGludGVsX2luaXRfY2RjbGtfaG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KTsKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==