From: Jani Nikula Subject: [PATCH v3] drm/i915/opregion: let user specify override VBT via firmware load Date: Wed, 31 May 2017 18:17:39 +0300 Message-ID: <20170531151739.26500-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9857E6E209 for ; Wed, 31 May 2017 15:14:17 +0000 (UTC) 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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org U29tZXRpbWVzIGl0IHdvdWxkIGJlIG1vc3QgZW5saWdodGVuaW5nIHRvIGRlYnVnIHN5c3RlbXMg YnkgcmVwbGFjaW5nCnRoZSBWQlQgdG8gYmUgdXNlZC4gRm9yIGV4YW1wbGUsIGluIHRoZSByZWZl cmVuY2VkIGJ1ZyB0aGUgQklPUyBwcm92aWRlcwpkaWZmZXJlbnQgVkJUIGRlcGVuZGluZyBvbiB0 aGUgYm9vdCBtb2RlIChVRUZJIHZzLiBsZWdhY3kpLiBJdCB3b3VsZCBiZQppbnRlcmVzdGluZyB0 byB0cnkgdGhlIGZhaWxpbmcgYm9vdCBtb2RlIHdpdGggdGhlIFZCVCBmcm9tIHRoZSB3b3JraW5n CmJvb3QsIGFuZCBzZWUgaWYgdGhhdCBtYWtlcyBhIGRpZmZlcmVuY2UuCgpBZGQgYSBtb2R1bGUg cGFyYW1ldGVyIHRvIGxvYWQgdGhlIFZCVCB1c2luZyB0aGUgZmlybXdhcmUgbG9hZGVyLCBub3QK dW5saWtlIHRoZSBFRElEIGZpcm13YXJlIG1lY2hhbmlzbS4KCkFzIGEgc3RhcnRpbmcgcG9pbnQg Zm9yIGV4cGVyaW1lbnRpbmcsIG9uZSBjYW4gcGljayB1cCB0aGUgQklPUyBwcm92aWRlZApWQlQg ZnJvbSAvc3lzL2tlcm5lbC9kZWJ1Zy9kcmkvMC9pOTE1X29wcmVnaW9uL2k5MTVfdmJ0LgoKdjI6 IGNsYXJpZnkgZmlybXdhcmUgbG9hZCByZXR1cm4gdmFsdWUgY2hlY2sgKEJvYikKCnYzOiBrZnJl ZSB0aGUgbG9hZGVkIGZpcm13YXJlIGJsb2IKClJlZmVyZW5jZXM6IGh0dHBzOi8vYnVncy5mcmVl ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODIyI2M4MwpSZXZpZXdlZC1ieTogQm9iIFBh YXV3ZSA8Ym9iLmoucGFhdXdlQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEg PGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyAgICB8 ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggICAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vcHJlZ2lvbi5jIHwgNDUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGJkZTU1NGViMjI1Ny4uYjIwMGZhYTE3N2NhIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTY0MSw2ICs2NDEsNyBAQCBzdHJ1Y3QgaW50ZWxf b3ByZWdpb24gewogCXUzMiBzd3NjaV9zYmNiX3N1Yl9mdW5jdGlvbnM7CiAJc3RydWN0IG9wcmVn aW9uX2FzbGUgKmFzbGU7CiAJdm9pZCAqcnZkYTsKKwl2b2lkICp2YnRfZmlybXdhcmU7CiAJY29u c3Qgdm9pZCAqdmJ0OwogCXUzMiB2YnRfc2l6ZTsKIAl1MzIgKmxpZF9zdGF0ZTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BhcmFtcy5jCmluZGV4IGI2YTdlMzYzZDA3Ni4uNmQ1ZDMzNGY1MGIxIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKQEAgLTExNSw2ICsxMTUsMTAgQEAgTU9EVUxFX1BB Uk1fREVTQyh2YnRfc2R2b19wYW5lbF90eXBlLAogCSJPdmVycmlkZS9JZ25vcmUgc2VsZWN0aW9u IG9mIFNEVk8gcGFuZWwgbW9kZSBpbiB0aGUgVkJUICIKIAkiKC0yPWlnbm9yZSwgLTE9YXV0byBb ZGVmYXVsdF0sIGluZGV4IGluIFZCVCBCSU9TIHRhYmxlKSIpOwogCittb2R1bGVfcGFyYW1fbmFt ZWRfdW5zYWZlKHZidF9maXJtd2FyZSwgaTkxNS52YnRfZmlybXdhcmUsIGNoYXJwLCAwNDAwKTsK K01PRFVMRV9QQVJNX0RFU0ModmJ0X2Zpcm13YXJlLAorCQkgIkxvYWQgVkJUIGZyb20gc3BlY2lm aWVkIGZpbGUgdW5kZXIgL2xpYi9maXJtd2FyZSIpOworCiBtb2R1bGVfcGFyYW1fbmFtZWRfdW5z YWZlKHJlc2V0LCBpOTE1LnJlc2V0LCBib29sLCAwNjAwKTsKIE1PRFVMRV9QQVJNX0RFU0MocmVz ZXQsICJBdHRlbXB0IEdQVSByZXNldHMgKGRlZmF1bHQ6IHRydWUpIik7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BhcmFtcy5oCmluZGV4IDM0MTQ4Y2M4NjM3Yy4uMGFlYjEwNmUwNmFmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlIDxsaW51 eC9jYWNoZS5oPiAvKiBmb3IgX19yZWFkX21vc3RseSAqLwogCiAjZGVmaW5lIEk5MTVfUEFSQU1T X0ZPUl9FQUNIKGZ1bmMpIFwKKwlmdW5jKGNoYXIgKiwgdmJ0X2Zpcm13YXJlKTsgXAogCWZ1bmMo aW50LCBtb2Rlc2V0KTsgXAogCWZ1bmMoaW50LCBwYW5lbF9pZ25vcmVfbGlkKTsgXAogCWZ1bmMo aW50LCBzZW1hcGhvcmVzKTsgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfb3ByZWdpb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKaW5k ZXggZDQ0NDY1MTkwZGMxLi5hNzFiMWM0MmFhZDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX29wcmVnaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf b3ByZWdpb24uYwpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8bGludXgvYWNwaS5oPgog I2luY2x1ZGUgPGxpbnV4L2RtaS5oPgorI2luY2x1ZGUgPGxpbnV4L2Zpcm13YXJlLmg+CiAjaW5j bHVkZSA8YWNwaS92aWRlby5oPgogCiAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KQEAgLTgyOSw2ICs4 MzAsMTAgQEAgdm9pZCBpbnRlbF9vcHJlZ2lvbl91bnJlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkJbWVtdW5tYXAob3ByZWdpb24tPnJ2ZGEpOwogCQlvcHJlZ2lv bi0+cnZkYSA9IE5VTEw7CiAJfQorCWlmIChvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlKSB7CisJCWtm cmVlKG9wcmVnaW9uLT52YnRfZmlybXdhcmUpOworCQlvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlID0g TlVMTDsKKwl9CiAJb3ByZWdpb24tPmhlYWRlciA9IE5VTEw7CiAJb3ByZWdpb24tPmFjcGkgPSBO VUxMOwogCW9wcmVnaW9uLT5zd3NjaSA9IE5VTEw7CkBAIC05MTIsNiArOTE3LDQzIEBAIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZG1pX3N5c3RlbV9pZCBpbnRlbF9ub19vcHJlZ2lvbl92YnRbXSA9IHsK IAl7IH0KIH07CiAKK3N0YXRpYyBpbnQgaW50ZWxfbG9hZF92YnRfZmlybXdhcmUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9vcHJlZ2lvbiAqb3By ZWdpb24gPSAmZGV2X3ByaXYtPm9wcmVnaW9uOworCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZncg PSBOVUxMOworCWNvbnN0IGNoYXIgKm5hbWUgPSBpOTE1LnZidF9maXJtd2FyZTsKKwlpbnQgcmV0 OworCisJaWYgKCFuYW1lIHx8ICEqbmFtZSkKKwkJcmV0dXJuIC1FTk9FTlQ7CisKKwlyZXQgPSBy ZXF1ZXN0X2Zpcm13YXJlKCZmdywgbmFtZSwgJmRldl9wcml2LT5kcm0ucGRldi0+ZGV2KTsKKwlp ZiAocmV0KSB7CisJCURSTV9FUlJPUigiUmVxdWVzdGluZyBWQlQgZmlybXdhcmUgXCIlc1wiIGZh aWxlZCAoJWQpXG4iLAorCQkJICBuYW1lLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCWlm IChpbnRlbF9iaW9zX2lzX3ZhbGlkX3ZidChmdy0+ZGF0YSwgZnctPnNpemUpKSB7CisJCW9wcmVn aW9uLT52YnRfZmlybXdhcmUgPSBrbWVtZHVwKGZ3LT5kYXRhLCBmdy0+c2l6ZSwgR0ZQX0tFUk5F TCk7CisJCWlmIChvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlKSB7CisJCQlEUk1fREVCVUdfS01TKCJG b3VuZCB2YWxpZCBWQlQgZmlybXdhcmUgXCIlc1wiXG4iLCBuYW1lKTsKKwkJCW9wcmVnaW9uLT52 YnQgPSBvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlOworCQkJb3ByZWdpb24tPnZidF9zaXplID0gZnct PnNpemU7CisJCQlyZXQgPSAwOworCQl9IGVsc2UgeworCQkJcmV0ID0gLUVOT01FTTsKKwkJfQor CX0gZWxzZSB7CisJCURSTV9ERUJVR19LTVMoIkludmFsaWQgVkJUIGZpcm13YXJlIFwiJXNcIlxu IiwgbmFtZSk7CisJCXJldCA9IC1FSU5WQUw7CisJfQorCisJcmVsZWFzZV9maXJtd2FyZShmdyk7 CisKKwlyZXR1cm4gcmV0OworfQorCiBpbnQgaW50ZWxfb3ByZWdpb25fc2V0dXAoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9vcHJlZ2lvbiAqb3By ZWdpb24gPSAmZGV2X3ByaXYtPm9wcmVnaW9uOwpAQCAtOTc0LDYgKzEwMTYsOSBAQCBpbnQgaW50 ZWxfb3ByZWdpb25fc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlm IChtYm94ZXMgJiBNQk9YX0FTTEVfRVhUKQogCQlEUk1fREVCVUdfRFJJVkVSKCJBU0xFIGV4dGVu c2lvbiBzdXBwb3J0ZWRcbiIpOwogCisJaWYgKGludGVsX2xvYWRfdmJ0X2Zpcm13YXJlKGRldl9w cml2KSA9PSAwKQorCQlnb3RvIG91dDsKKwogCWlmIChkbWlfY2hlY2tfc3lzdGVtKGludGVsX25v X29wcmVnaW9uX3ZidCkpCiAJCWdvdG8gb3V0OwogCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=