From: Ville Syrjala Subject: [PATCH 15/29] drm/i915: Pass the encoder type explicitly to skl_set_iboost() Date: Mon, 18 Sep 2017 21:25:50 +0300 Message-ID: <20170918182604.9519-16-ville.syrjala@linux.intel.com> References: <20170918182604.9519-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 851B76E3F9 for ; Mon, 18 Sep 2017 18:27:06 +0000 (UTC) In-Reply-To: <20170918182604.9519-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmVu Y29kZXItPnR5cGUgaXNuJ3QgcmVsaWFibGUgZm9yIERQL0hETUkgZW5jb2RlcnMsIHNvIHBhc3Mg dGhlIHR5cGUKZXhwbGljaXR5IHRvIHNrbF9zZXRfaWJvb3N0KCkuIEFsc28gdGFrZSB0aGUgb3Bw b3J0dW5pdHkgdG8gc3RyZWFtbGluZQp0aGUgY29kZS4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMgfCA1NyArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCAwNzQ0OWI0YzU4ZGIuLjZkNzNjZmM3 MGIwOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTE3NzgsNDkgKzE3NzgsMzYgQEAg c3RhdGljIHZvaWQgX3NrbF9kZGlfc2V0X2lib29zdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJSTkxNV9XUklURShESVNQSU9fQ1JfVFhfQk1VX0NSMCwgdG1wKTsKIH0KIAot c3RhdGljIHZvaWQgc2tsX2RkaV9zZXRfaWJvb3N0KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLCB1MzIgbGV2ZWwpCitzdGF0aWMgdm9pZCBza2xfZGRpX3NldF9pYm9vc3Qoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkgICAgICAgdTMyIGxldmVsLCBpbnQgdHlwZSkKIHsK IAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGVuY190b19kaWdf cG9ydCgmZW5jb2Rlci0+YmFzZSk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldik7CiAJZW51bSBwb3J0IHBv cnQgPSBpbnRlbF9kaWdfcG9ydC0+cG9ydDsKLQlpbnQgdHlwZSA9IGVuY29kZXItPnR5cGU7Ci0J Y29uc3Qgc3RydWN0IGRkaV9idWZfdHJhbnMgKmRkaV90cmFuc2xhdGlvbnM7CiAJdWludDhfdCBp Ym9vc3Q7Ci0JdWludDhfdCBkcF9pYm9vc3QsIGhkbWlfaWJvb3N0OwotCWludCBuX2VudHJpZXM7 CiAKLQkvKiBWQlQgbWF5IG92ZXJyaWRlIHN0YW5kYXJkIGJvb3N0IHZhbHVlcyAqLwotCWRwX2li b29zdCA9IGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XS5kcF9ib29zdF9sZXZlbDsK LQloZG1pX2lib29zdCA9IGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XS5oZG1pX2Jv b3N0X2xldmVsOworCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKQorCQlpYm9vc3QgPSBk ZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bcG9ydF0uaGRtaV9ib29zdF9sZXZlbDsKKwllbHNl CisJCWlib29zdCA9IGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XS5kcF9ib29zdF9s ZXZlbDsKIAotCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9EUCkgewotCQlpZiAoZHBfaWJvb3N0 KSB7Ci0JCQlpYm9vc3QgPSBkcF9pYm9vc3Q7Ci0JCX0gZWxzZSB7Ci0JCQlkZGlfdHJhbnNsYXRp b25zID0gaW50ZWxfZGRpX2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsICZuX2VudHJpZXMpOwot CQkJaWJvb3N0ID0gZGRpX3RyYW5zbGF0aW9uc1tsZXZlbF0uaV9ib29zdDsKLQkJfQotCX0gZWxz ZSBpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7Ci0JCWlmIChkcF9pYm9vc3QpIHsKLQkJ CWlib29zdCA9IGRwX2lib29zdDsKLQkJfSBlbHNlIHsKKwlpZiAoaWJvb3N0ID09IDApIHsKKwkJ Y29uc3Qgc3RydWN0IGRkaV9idWZfdHJhbnMgKmRkaV90cmFuc2xhdGlvbnM7CisJCWludCBuX2Vu dHJpZXM7CisKKwkJaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpCisJCQlkZGlfdHJhbnNs YXRpb25zID0gaW50ZWxfZGRpX2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50cmll cyk7CisJCWVsc2UgaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkKIAkJCWRkaV90cmFuc2xh dGlvbnMgPSBpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19lZHAoZGV2X3ByaXYsICZuX2VudHJpZXMp OworCQllbHNlCisJCQlkZGlfdHJhbnNsYXRpb25zID0gaW50ZWxfZGRpX2dldF9idWZfdHJhbnNf ZHAoZGV2X3ByaXYsICZuX2VudHJpZXMpOwogCi0JCQlpZiAoV0FSTl9PTihwb3J0ICE9IFBPUlRf QSAmJgotCQkJCSAgICBwb3J0ICE9IFBPUlRfRSAmJiBuX2VudHJpZXMgPiA5KSkKLQkJCQluX2Vu dHJpZXMgPSA5OworCQlpZiAoV0FSTl9PTih0eXBlICE9IElOVEVMX09VVFBVVF9IRE1JICYmCisJ CQkgICAgcG9ydCAhPSBQT1JUX0EgJiYKKwkJCSAgICBwb3J0ICE9IFBPUlRfRSAmJiBuX2VudHJp ZXMgPiA5KSkKKwkJCW5fZW50cmllcyA9IDk7CiAKLQkJCWlib29zdCA9IGRkaV90cmFuc2xhdGlv bnNbbGV2ZWxdLmlfYm9vc3Q7Ci0JCX0KLQl9IGVsc2UgaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVU X0hETUkpIHsKLQkJaWYgKGhkbWlfaWJvb3N0KSB7Ci0JCQlpYm9vc3QgPSBoZG1pX2lib29zdDsK LQkJfSBlbHNlIHsKLQkJCWRkaV90cmFuc2xhdGlvbnMgPSBpbnRlbF9kZGlfZ2V0X2J1Zl90cmFu c19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKLQkJCWlib29zdCA9IGRkaV90cmFuc2xhdGlv bnNbbGV2ZWxdLmlfYm9vc3Q7Ci0JCX0KLQl9IGVsc2UgewotCQlyZXR1cm47CisJCWlib29zdCA9 IGRkaV90cmFuc2xhdGlvbnNbbGV2ZWxdLmlfYm9vc3Q7CiAJfQogCiAJLyogTWFrZSBzdXJlIHRo YXQgdGhlIHJlcXVlc3RlZCBJX2Jvb3N0IGlzIHZhbGlkICovCkBAIC0yMDg2LDcgKzIwNzMsNyBA QCB1aW50MzJfdCBkZGlfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQog CXVpbnQzMl90IGxldmVsID0gaW50ZWxfZGRpX2RwX2xldmVsKGludGVsX2RwKTsKIAogCWlmIChJ U19HRU45X0JDKGRldl9wcml2KSkKLQkgICAgc2tsX2RkaV9zZXRfaWJvb3N0KGVuY29kZXIsIGxl dmVsKTsKKwkJc2tsX2RkaV9zZXRfaWJvb3N0KGVuY29kZXIsIGxldmVsLCBlbmNvZGVyLT50eXBl KTsKIAogCXJldHVybiBERElfQlVGX1RSQU5TX1NFTEVDVChsZXZlbCk7CiB9CkBAIC0yMjA4LDcg KzIxOTUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJsZV9oZG1pKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQlpbnRlbF9wcmVwYXJlX2hkbWlfZGRpX2J1ZmZlcnMo ZW5jb2Rlcik7CiAKIAlpZiAoSVNfR0VOOV9CQyhkZXZfcHJpdikpCi0JCXNrbF9kZGlfc2V0X2li b29zdChlbmNvZGVyLCBsZXZlbCk7CisJCXNrbF9kZGlfc2V0X2lib29zdChlbmNvZGVyLCBsZXZl bCwgSU5URUxfT1VUUFVUX0hETUkpOwogCiAJaW50ZWxfZGlnX3BvcnQtPnNldF9pbmZvZnJhbWVz KCZlbmNvZGVyLT5iYXNlLAogCQkJCSAgICAgICBjcnRjX3N0YXRlLT5oYXNfaW5mb2ZyYW1lLAot LSAKMi4xMy41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK