From: Jani Nikula Subject: [PATCH v3 RESEND] drm/i915/opregion: let user specify override VBT via firmware load Date: Thu, 17 Aug 2017 14:52:09 +0300 Message-ID: <20170817115209.25912-1-jani.nikula@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 DBEB9892FA for ; Thu, 17 Aug 2017 11:47:20 +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 dS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDZjMjVjODUyMGM4Ny4uM2VlNGZkMmE5YjQxIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTY0Niw2ICs2NDYsNyBAQCBzdHJ1Y3QgaW50ZWxf b3ByZWdpb24gewogCXUzMiBzd3NjaV9zYmNiX3N1Yl9mdW5jdGlvbnM7CiAJc3RydWN0IG9wcmVn aW9uX2FzbGUgKmFzbGU7CiAJdm9pZCAqcnZkYTsKKwl2b2lkICp2YnRfZmlybXdhcmU7CiAJY29u c3Qgdm9pZCAqdmJ0OwogCXUzMiB2YnRfc2l6ZTsKIAl1MzIgKmxpZF9zdGF0ZTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BhcmFtcy5jCmluZGV4IDE0ZTJjMmU1N2Y5Ni4uOGFiMDAzZGNhMTEzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKQEAgLTExOCw2ICsxMTgsMTAgQEAgTU9EVUxFX1BB Uk1fREVTQyh2YnRfc2R2b19wYW5lbF90eXBlLAogbW9kdWxlX3BhcmFtX25hbWVkX3Vuc2FmZShy ZXNldCwgaTkxNS5yZXNldCwgaW50LCAwNjAwKTsKIE1PRFVMRV9QQVJNX0RFU0MocmVzZXQsICJB dHRlbXB0IEdQVSByZXNldHMgKDA9ZGlzYWJsZWQsIDE9ZnVsbCBncHUgcmVzZXQsIDI9ZW5naW5l IHJlc2V0IFtkZWZhdWx0XSkiKTsKIAorbW9kdWxlX3BhcmFtX25hbWVkX3Vuc2FmZSh2YnRfZmly bXdhcmUsIGk5MTUudmJ0X2Zpcm13YXJlLCBjaGFycCwgMDQwMCk7CitNT0RVTEVfUEFSTV9ERVND KHZidF9maXJtd2FyZSwKKwkJICJMb2FkIFZCVCBmcm9tIHNwZWNpZmllZCBmaWxlIHVuZGVyIC9s aWIvZmlybXdhcmUiKTsKKwogI2lmIElTX0VOQUJMRUQoQ09ORklHX0RSTV9JOTE1X0NBUFRVUkVf RVJST1IpCiBtb2R1bGVfcGFyYW1fbmFtZWQoZXJyb3JfY2FwdHVyZSwgaTkxNS5lcnJvcl9jYXB0 dXJlLCBib29sLCAwNjAwKTsKIE1PRFVMRV9QQVJNX0RFU0MoZXJyb3JfY2FwdHVyZSwKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3BhcmFtcy5oCmluZGV4IGZlYmJmZGJkMzBiZC4uYWM4NDQ3MDljOTdlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRl IDxsaW51eC9jYWNoZS5oPiAvKiBmb3IgX19yZWFkX21vc3RseSAqLwogCiAjZGVmaW5lIEk5MTVf UEFSQU1TX0ZPUl9FQUNIKGZ1bmMpIFwKKwlmdW5jKGNoYXIgKiwgdmJ0X2Zpcm13YXJlKTsgXAog CWZ1bmMoaW50LCBtb2Rlc2V0KTsgXAogCWZ1bmMoaW50LCBwYW5lbF9pZ25vcmVfbGlkKTsgXAog CWZ1bmMoaW50LCBzZW1hcGhvcmVzKTsgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ByZWdpb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9u LmMKaW5kZXggMmJkMDMwMDFjYzcwLi45ODE1NGVmY2IyZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfb3ByZWdpb24uYwpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8bGludXgvYWNw aS5oPgogI2luY2x1ZGUgPGxpbnV4L2RtaS5oPgorI2luY2x1ZGUgPGxpbnV4L2Zpcm13YXJlLmg+ CiAjaW5jbHVkZSA8YWNwaS92aWRlby5oPgogCiAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KQEAgLTgy OSw2ICs4MzAsMTAgQEAgdm9pZCBpbnRlbF9vcHJlZ2lvbl91bnJlZ2lzdGVyKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJbWVtdW5tYXAob3ByZWdpb24tPnJ2ZGEpOwogCQlv cHJlZ2lvbi0+cnZkYSA9IE5VTEw7CiAJfQorCWlmIChvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlKSB7 CisJCWtmcmVlKG9wcmVnaW9uLT52YnRfZmlybXdhcmUpOworCQlvcHJlZ2lvbi0+dmJ0X2Zpcm13 YXJlID0gTlVMTDsKKwl9CiAJb3ByZWdpb24tPmhlYWRlciA9IE5VTEw7CiAJb3ByZWdpb24tPmFj cGkgPSBOVUxMOwogCW9wcmVnaW9uLT5zd3NjaSA9IE5VTEw7CkBAIC05MTIsNiArOTE3LDQzIEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZG1pX3N5c3RlbV9pZCBpbnRlbF9ub19vcHJlZ2lvbl92YnRb XSA9IHsKIAl7IH0KIH07CiAKK3N0YXRpYyBpbnQgaW50ZWxfbG9hZF92YnRfZmlybXdhcmUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9vcHJlZ2lv biAqb3ByZWdpb24gPSAmZGV2X3ByaXYtPm9wcmVnaW9uOworCWNvbnN0IHN0cnVjdCBmaXJtd2Fy ZSAqZncgPSBOVUxMOworCWNvbnN0IGNoYXIgKm5hbWUgPSBpOTE1LnZidF9maXJtd2FyZTsKKwlp bnQgcmV0OworCisJaWYgKCFuYW1lIHx8ICEqbmFtZSkKKwkJcmV0dXJuIC1FTk9FTlQ7CisKKwly ZXQgPSByZXF1ZXN0X2Zpcm13YXJlKCZmdywgbmFtZSwgJmRldl9wcml2LT5kcm0ucGRldi0+ZGV2 KTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiUmVxdWVzdGluZyBWQlQgZmlybXdhcmUgXCIl c1wiIGZhaWxlZCAoJWQpXG4iLAorCQkJICBuYW1lLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0K KworCWlmIChpbnRlbF9iaW9zX2lzX3ZhbGlkX3ZidChmdy0+ZGF0YSwgZnctPnNpemUpKSB7CisJ CW9wcmVnaW9uLT52YnRfZmlybXdhcmUgPSBrbWVtZHVwKGZ3LT5kYXRhLCBmdy0+c2l6ZSwgR0ZQ X0tFUk5FTCk7CisJCWlmIChvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlKSB7CisJCQlEUk1fREVCVUdf S01TKCJGb3VuZCB2YWxpZCBWQlQgZmlybXdhcmUgXCIlc1wiXG4iLCBuYW1lKTsKKwkJCW9wcmVn aW9uLT52YnQgPSBvcHJlZ2lvbi0+dmJ0X2Zpcm13YXJlOworCQkJb3ByZWdpb24tPnZidF9zaXpl ID0gZnctPnNpemU7CisJCQlyZXQgPSAwOworCQl9IGVsc2UgeworCQkJcmV0ID0gLUVOT01FTTsK KwkJfQorCX0gZWxzZSB7CisJCURSTV9ERUJVR19LTVMoIkludmFsaWQgVkJUIGZpcm13YXJlIFwi JXNcIlxuIiwgbmFtZSk7CisJCXJldCA9IC1FSU5WQUw7CisJfQorCisJcmVsZWFzZV9maXJtd2Fy ZShmdyk7CisKKwlyZXR1cm4gcmV0OworfQorCiBpbnQgaW50ZWxfb3ByZWdpb25fc2V0dXAoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9vcHJlZ2lv biAqb3ByZWdpb24gPSAmZGV2X3ByaXYtPm9wcmVnaW9uOwpAQCAtOTc0LDYgKzEwMTYsOSBAQCBp bnQgaW50ZWxfb3ByZWdpb25fc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWlmIChtYm94ZXMgJiBNQk9YX0FTTEVfRVhUKQogCQlEUk1fREVCVUdfRFJJVkVSKCJBU0xF IGV4dGVuc2lvbiBzdXBwb3J0ZWRcbiIpOwogCisJaWYgKGludGVsX2xvYWRfdmJ0X2Zpcm13YXJl KGRldl9wcml2KSA9PSAwKQorCQlnb3RvIG91dDsKKwogCWlmIChkbWlfY2hlY2tfc3lzdGVtKGlu dGVsX25vX29wcmVnaW9uX3ZidCkpCiAJCWdvdG8gb3V0OwogCi0tIAoyLjExLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=