From: Ville Syrjala Subject: [PATCH v2 03/10] drm/i915: Pass the encoder type explicitly to skl_set_iboost() Date: Mon, 16 Oct 2017 17:56:58 +0300 Message-ID: <20171016145705.11780-4-ville.syrjala@linux.intel.com> References: <20171016145705.11780-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5A486E406 for ; Mon, 16 Oct 2017 14:57:17 +0000 (UTC) In-Reply-To: <20171016145705.11780-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 b3J0dW5pdHkgdG8gc3RyZWFtbGluZQp0aGUgY29kZS4KCnYyOiBDbGVhbiB1cCB0aGUgYXJndW1l bnQgdHlwZXMgdG8gc2tsX2RkaV9zZXRfaWJvb3N0KCkgd2hpbGUgYXQgaXQKClNpZ25lZC1vZmYt Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgfCA1OSArKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwg MzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCBlNmM4ODRhNmQ0 MDguLmNmMGIyZDNkZTE1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTE3ODgsNDkg KzE3ODgsMzYgQEAgc3RhdGljIHZvaWQgX3NrbF9kZGlfc2V0X2lib29zdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJSTkxNV9XUklURShESVNQSU9fQ1JfVFhfQk1VX0NSMCwg dG1wKTsKIH0KIAotc3RhdGljIHZvaWQgc2tsX2RkaV9zZXRfaWJvb3N0KHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLCB1MzIgbGV2ZWwpCitzdGF0aWMgdm9pZCBza2xfZGRpX3NldF9pYm9v c3Qoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkgICAgICAgaW50IGxldmVsLCBl bnVtIGludGVsX291dHB1dF90eXBlIHR5cGUpCiB7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9y dCAqaW50ZWxfZGlnX3BvcnQgPSBlbmNfdG9fZGlnX3BvcnQoJmVuY29kZXItPmJhc2UpOwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZGlnX3BvcnQt PmJhc2UuYmFzZS5kZXYpOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGlnX3BvcnQtPnBvcnQ7 Ci0JaW50IHR5cGUgPSBlbmNvZGVyLT50eXBlOwotCWNvbnN0IHN0cnVjdCBkZGlfYnVmX3RyYW5z ICpkZGlfdHJhbnNsYXRpb25zOwogCXVpbnQ4X3QgaWJvb3N0OwotCXVpbnQ4X3QgZHBfaWJvb3N0 LCBoZG1pX2lib29zdDsKLQlpbnQgbl9lbnRyaWVzOwogCi0JLyogVkJUIG1heSBvdmVycmlkZSBz dGFuZGFyZCBib29zdCB2YWx1ZXMgKi8KLQlkcF9pYm9vc3QgPSBkZXZfcHJpdi0+dmJ0LmRkaV9w b3J0X2luZm9bcG9ydF0uZHBfYm9vc3RfbGV2ZWw7Ci0JaGRtaV9pYm9vc3QgPSBkZXZfcHJpdi0+ dmJ0LmRkaV9wb3J0X2luZm9bcG9ydF0uaGRtaV9ib29zdF9sZXZlbDsKKwlpZiAodHlwZSA9PSBJ TlRFTF9PVVRQVVRfSERNSSkKKwkJaWJvb3N0ID0gZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZv W3BvcnRdLmhkbWlfYm9vc3RfbGV2ZWw7CisJZWxzZQorCQlpYm9vc3QgPSBkZXZfcHJpdi0+dmJ0 LmRkaV9wb3J0X2luZm9bcG9ydF0uZHBfYm9vc3RfbGV2ZWw7CiAKLQlpZiAodHlwZSA9PSBJTlRF TF9PVVRQVVRfRFApIHsKLQkJaWYgKGRwX2lib29zdCkgewotCQkJaWJvb3N0ID0gZHBfaWJvb3N0 OwotCQl9IGVsc2UgewotCQkJZGRpX3RyYW5zbGF0aW9ucyA9IGludGVsX2RkaV9nZXRfYnVmX3Ry YW5zX2RwKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKLQkJCWlib29zdCA9IGRkaV90cmFuc2xhdGlv bnNbbGV2ZWxdLmlfYm9vc3Q7Ci0JCX0KLQl9IGVsc2UgaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVU X0VEUCkgewotCQlpZiAoZHBfaWJvb3N0KSB7Ci0JCQlpYm9vc3QgPSBkcF9pYm9vc3Q7Ci0JCX0g ZWxzZSB7Ci0JCQlkZGlfdHJhbnNsYXRpb25zID0gaW50ZWxfZGRpX2dldF9idWZfdHJhbnNfZWRw KGRldl9wcml2LCAmbl9lbnRyaWVzKTsKKwlpZiAoaWJvb3N0ID09IDApIHsKKwkJY29uc3Qgc3Ry dWN0IGRkaV9idWZfdHJhbnMgKmRkaV90cmFuc2xhdGlvbnM7CisJCWludCBuX2VudHJpZXM7CiAK LQkJCWlmIChXQVJOX09OKHBvcnQgIT0gUE9SVF9BICYmCi0JCQkJICAgIHBvcnQgIT0gUE9SVF9F ICYmIG5fZW50cmllcyA+IDkpKQotCQkJCW5fZW50cmllcyA9IDk7Ci0KLQkJCWlib29zdCA9IGRk aV90cmFuc2xhdGlvbnNbbGV2ZWxdLmlfYm9vc3Q7Ci0JCX0KLQl9IGVsc2UgaWYgKHR5cGUgPT0g SU5URUxfT1VUUFVUX0hETUkpIHsKLQkJaWYgKGhkbWlfaWJvb3N0KSB7Ci0JCQlpYm9vc3QgPSBo ZG1pX2lib29zdDsKLQkJfSBlbHNlIHsKKwkJaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkp CiAJCQlkZGlfdHJhbnNsYXRpb25zID0gaW50ZWxfZGRpX2dldF9idWZfdHJhbnNfaGRtaShkZXZf cHJpdiwgJm5fZW50cmllcyk7Ci0JCQlpYm9vc3QgPSBkZGlfdHJhbnNsYXRpb25zW2xldmVsXS5p X2Jvb3N0OwotCQl9Ci0JfSBlbHNlIHsKLQkJcmV0dXJuOworCQllbHNlIGlmICh0eXBlID09IElO VEVMX09VVFBVVF9FRFApCisJCQlkZGlfdHJhbnNsYXRpb25zID0gaW50ZWxfZGRpX2dldF9idWZf dHJhbnNfZWRwKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKKwkJZWxzZQorCQkJZGRpX3RyYW5zbGF0 aW9ucyA9IGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2RwKGRldl9wcml2LCAmbl9lbnRyaWVzKTsK KworCQlpZiAoV0FSTl9PTih0eXBlICE9IElOVEVMX09VVFBVVF9IRE1JICYmCisJCQkgICAgcG9y dCAhPSBQT1JUX0EgJiYKKwkJCSAgICBwb3J0ICE9IFBPUlRfRSAmJiBuX2VudHJpZXMgPiA5KSkK KwkJCW5fZW50cmllcyA9IDk7CisKKwkJaWJvb3N0ID0gZGRpX3RyYW5zbGF0aW9uc1tsZXZlbF0u aV9ib29zdDsKIAl9CiAKIAkvKiBNYWtlIHN1cmUgdGhhdCB0aGUgcmVxdWVzdGVkIElfYm9vc3Qg aXMgdmFsaWQgKi8KQEAgLTIwOTYsNyArMjA4Myw3IEBAIHVpbnQzMl90IGRkaV9zaWduYWxfbGV2 ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJdWludDMyX3QgbGV2ZWwgPSBpbnRlbF9k ZGlfZHBfbGV2ZWwoaW50ZWxfZHApOwogCiAJaWYgKElTX0dFTjlfQkMoZGV2X3ByaXYpKQotCSAg ICBza2xfZGRpX3NldF9pYm9vc3QoZW5jb2RlciwgbGV2ZWwpOworCQlza2xfZGRpX3NldF9pYm9v c3QoZW5jb2RlciwgbGV2ZWwsIGVuY29kZXItPnR5cGUpOwogCiAJcmV0dXJuIERESV9CVUZfVFJB TlNfU0VMRUNUKGxldmVsKTsKIH0KQEAgLTIyMTksNyArMjIwNiw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2RkaV9wcmVfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ CWludGVsX3ByZXBhcmVfaGRtaV9kZGlfYnVmZmVycyhlbmNvZGVyKTsKIAogCWlmIChJU19HRU45 X0JDKGRldl9wcml2KSkKLQkJc2tsX2RkaV9zZXRfaWJvb3N0KGVuY29kZXIsIGxldmVsKTsKKwkJ c2tsX2RkaV9zZXRfaWJvb3N0KGVuY29kZXIsIGxldmVsLCBJTlRFTF9PVVRQVVRfSERNSSk7CiAK IAlpbnRlbF9kaWdfcG9ydC0+c2V0X2luZm9mcmFtZXMoJmVuY29kZXItPmJhc2UsCiAJCQkJICAg ICAgIGNydGNfc3RhdGUtPmhhc19pbmZvZnJhbWUsCi0tIAoyLjEzLjYKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=