From: Jani Nikula Subject: [PATCH RESEND 4/4] drm/i915/opregion: let user specify override VBT via firmware load Date: Wed, 29 Mar 2017 13:32:58 +0300 Message-ID: <1490783578-6065-4-git-send-email-jani.nikula@intel.com> References: <1490783578-6065-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4C936E70F for ; Wed, 29 Mar 2017 10:33:11 +0000 (UTC) In-Reply-To: <1490783578-6065-1-git-send-email-jani.nikula@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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org U29tZXRpbWVzIGl0IHdvdWxkIGJlIG1vc3QgZW5saWdodGVuaW5nIHRvIGRlYnVnIHN5c3RlbXMg YnkgcmVwbGFjaW5nCnRoZSBWQlQgdG8gYmUgdXNlZC4gRm9yIGV4YW1wbGUsIGluIHRoZSByZWZl cmVuY2VkIGJ1ZyB0aGUgQklPUyBwcm92aWRlcwpkaWZmZXJlbnQgVkJUIGRlcGVuZGluZyBvbiB0 aGUgYm9vdCBtb2RlIChVRUZJIHZzLiBsZWdhY3kpLiBJdCB3b3VsZCBiZQppbnRlcmVzdGluZyB0 byB0cnkgdGhlIGZhaWxpbmcgYm9vdCBtb2RlIHdpdGggdGhlIFZCVCBmcm9tIHRoZSB3b3JraW5n CmJvb3QsIGFuZCBzZWUgaWYgdGhhdCBtYWtlcyBhIGRpZmZlcmVuY2UuCgpBZGQgYSBtb2R1bGUg cGFyYW1ldGVyIHRvIGxvYWQgdGhlIFZCVCB1c2luZyB0aGUgZmlybXdhcmUgbG9hZGVyLCBub3QK dW5saWtlIHRoZSBFRElEIGZpcm13YXJlIG1lY2hhbmlzbS4KCkFzIGEgc3RhcnRpbmcgcG9pbnQg Zm9yIGV4cGVyaW1lbnRpbmcsIG9uZSBjYW4gcGljayB1cCB0aGUgQklPUyBwcm92aWRlZApWQlQg ZnJvbSAvc3lzL2tlcm5lbC9kZWJ1Zy9kcmkvMC9pOTE1X29wcmVnaW9uL2k5MTVfdmJ0LgoKUmVm ZXJlbmNlczogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc4 MjIjYzgzClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyAgICB8ICA0ICsrKysKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggICAgfCAgMSArCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9vcHJlZ2lvbi5jIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BhcmFtcy5jCmluZGV4IGI2YTdlMzYzZDA3Ni4uNmQ1ZDMzNGY1MGIxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKQEAgLTExNSw2ICsxMTUsMTAgQEAgTU9EVUxFX1BBUk1f REVTQyh2YnRfc2R2b19wYW5lbF90eXBlLAogCSJPdmVycmlkZS9JZ25vcmUgc2VsZWN0aW9uIG9m IFNEVk8gcGFuZWwgbW9kZSBpbiB0aGUgVkJUICIKIAkiKC0yPWlnbm9yZSwgLTE9YXV0byBbZGVm YXVsdF0sIGluZGV4IGluIFZCVCBCSU9TIHRhYmxlKSIpOwogCittb2R1bGVfcGFyYW1fbmFtZWRf dW5zYWZlKHZidF9maXJtd2FyZSwgaTkxNS52YnRfZmlybXdhcmUsIGNoYXJwLCAwNDAwKTsKK01P RFVMRV9QQVJNX0RFU0ModmJ0X2Zpcm13YXJlLAorCQkgIkxvYWQgVkJUIGZyb20gc3BlY2lmaWVk IGZpbGUgdW5kZXIgL2xpYi9maXJtd2FyZSIpOworCiBtb2R1bGVfcGFyYW1fbmFtZWRfdW5zYWZl KHJlc2V0LCBpOTE1LnJlc2V0LCBib29sLCAwNjAwKTsKIE1PRFVMRV9QQVJNX0RFU0MocmVzZXQs ICJBdHRlbXB0IEdQVSByZXNldHMgKGRlZmF1bHQ6IHRydWUpIik7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BhcmFtcy5oCmluZGV4IDM0MTQ4Y2M4NjM3Yy4uMGFlYjEwNmUwNmFmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcGFyYW1zLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlIDxsaW51eC9j YWNoZS5oPiAvKiBmb3IgX19yZWFkX21vc3RseSAqLwogCiAjZGVmaW5lIEk5MTVfUEFSQU1TX0ZP Ul9FQUNIKGZ1bmMpIFwKKwlmdW5jKGNoYXIgKiwgdmJ0X2Zpcm13YXJlKTsgXAogCWZ1bmMoaW50 LCBtb2Rlc2V0KTsgXAogCWZ1bmMoaW50LCBwYW5lbF9pZ25vcmVfbGlkKTsgXAogCWZ1bmMoaW50 LCBzZW1hcGhvcmVzKTsgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf b3ByZWdpb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX29wcmVnaW9uLmMKaW5kZXgg ZDQ0NDY1MTkwZGMxLi43Y2JkODAxNTE2YWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX29wcmVnaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3By ZWdpb24uYwpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8bGludXgvYWNwaS5oPgogI2lu Y2x1ZGUgPGxpbnV4L2RtaS5oPgorI2luY2x1ZGUgPGxpbnV4L2Zpcm13YXJlLmg+CiAjaW5jbHVk ZSA8YWNwaS92aWRlby5oPgogCiAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KQEAgLTkxMiw2ICs5MTMs NDIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkbWlfc3lzdGVtX2lkIGludGVsX25vX29wcmVnaW9u X3ZidFtdID0gewogCXsgfQogfTsKIAorc3RhdGljIGludCBpbnRlbF9sb2FkX3ZidF9maXJtd2Fy ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGludGVsX29w cmVnaW9uICpvcHJlZ2lvbiA9ICZkZXZfcHJpdi0+b3ByZWdpb247CisJY29uc3Qgc3RydWN0IGZp cm13YXJlICpmdyA9IE5VTEw7CisJY29uc3QgY2hhciAqbmFtZSA9IGk5MTUudmJ0X2Zpcm13YXJl OworCWludCByZXQ7CisKKwlpZiAoIW5hbWUgfHwgISpuYW1lKQorCQlyZXR1cm4gLUVOT0VOVDsK KworCXJldCA9IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCBuYW1lLCAmZGV2X3ByaXYtPmRybS5wZGV2 LT5kZXYpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJSZXF1ZXN0aW5nIFZCVCBmaXJtd2Fy ZSBcIiVzXCIgZmFpbGVkICglZClcbiIsCisJCQkgIG5hbWUsIHJldCk7CisJCXJldHVybiByZXQ7 CisJfQorCisJaWYgKGludGVsX2Jpb3NfaXNfdmFsaWRfdmJ0KGZ3LT5kYXRhLCBmdy0+c2l6ZSkp IHsKKwkJb3ByZWdpb24tPnZidCA9IGttZW1kdXAoZnctPmRhdGEsIGZ3LT5zaXplLCBHRlBfS0VS TkVMKTsKKwkJaWYgKG9wcmVnaW9uLT52YnQpIHsKKwkJCURSTV9ERUJVR19LTVMoIkZvdW5kIHZh bGlkIFZCVCBmaXJtd2FyZSBcIiVzXCJcbiIsIG5hbWUpOworCQkJb3ByZWdpb24tPnZidF9zaXpl ID0gZnctPnNpemU7CisJCQlyZXQgPSAwOworCQl9IGVsc2UgeworCQkJcmV0ID0gLUVOT01FTTsK KwkJfQorCX0gZWxzZSB7CisJCURSTV9ERUJVR19LTVMoIkludmFsaWQgVkJUIGZpcm13YXJlIFwi JXNcIlxuIiwgbmFtZSk7CisJCXJldCA9IC1FSU5WQUw7CisJfQorCisJcmVsZWFzZV9maXJtd2Fy ZShmdyk7CisKKwlyZXR1cm4gcmV0OworfQorCiBpbnQgaW50ZWxfb3ByZWdpb25fc2V0dXAoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9vcHJlZ2lv biAqb3ByZWdpb24gPSAmZGV2X3ByaXYtPm9wcmVnaW9uOwpAQCAtOTc0LDYgKzEwMTEsOSBAQCBp bnQgaW50ZWxfb3ByZWdpb25fc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWlmIChtYm94ZXMgJiBNQk9YX0FTTEVfRVhUKQogCQlEUk1fREVCVUdfRFJJVkVSKCJBU0xF IGV4dGVuc2lvbiBzdXBwb3J0ZWRcbiIpOwogCisJaWYgKCFpbnRlbF9sb2FkX3ZidF9maXJtd2Fy ZShkZXZfcHJpdikpCisJCWdvdG8gb3V0OworCiAJaWYgKGRtaV9jaGVja19zeXN0ZW0oaW50ZWxf bm9fb3ByZWdpb25fdmJ0KSkKIAkJZ290byBvdXQ7CiAKLS0gCjIuMS40CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK