From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH v2 4/4] drm: handle override edid and firmware EDID at drm_do_get_edid() level Date: Fri, 17 Feb 2017 17:20:54 +0200 Message-ID: <1487344854-18777-5-git-send-email-jani.nikula@intel.com> References: <1487344854-18777-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: In-Reply-To: <1487344854-18777-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: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SGFuZGxlIGRlYnVnZnMgb3ZlcnJpZGUgZWRpZCBhbmQgZmlybXdhcmUgZWRpZCBhdCB0aGUgbG93 IGxldmVsIHRvCnRyYW5zcGFyZW50bHkgYW5kIGNvbXBsZXRlbHkgcmVwbGFjZSB0aGUgcmVhbCBl ZGlkLiBQcmV2aW91c2x5LCB3ZQpwcmFjdGljYWxseSBvbmx5IHVzZWQgdGhlIG1vZGVzIGZyb20g dGhlIG92ZXJyaWRlIEVESUQsIGFuZCBub25lIG9mIHRoZQpvdGhlciBkYXRhLiBUaGlzIGFsc28g cHJldmVudHMgYWN0dWFsIEVESUQgcmVhZHMgd2hlbiB0aGUgRURJRCBpcyB0byBiZQpvdmVycmlk ZGVuLCBidXQgcmV0YWlucyB0aGUgRERDIHByb2JlLgoKTW92ZSBmaXJtd2FyZSBFRElEIGxvYWRp bmcgZnJvbSBoZWxwZXIgdG8gY29yZSwgYXMgdGhlIGZ1bmN0aW9uYWxpdHkKbW92ZXMgdG8gbG93 ZXIgbGV2ZWwgYXMgd2VsbC4gVGhpcyB3aWxsIHJlc3VsdCBpbiBhIGNoYW5nZSBvZiBtb2R1bGUK cGFyYW1ldGVyIGZyb20gZHJtX2ttc19oZWxwZXIuZWRpZF9maXJtd2FyZSB0byBkcm0uZWRpZF9m aXJtd2FyZSwgd2hpY2gKYXJndWFibHkgbWFrZXMgbW9yZSBzZW5zZSBhbnl3YXkuCgpGSVhNRTog dmFsaWRhdGUgb3ZlcnJpZGUgZWRpZCwgZGVkdXBsaWNhdGUgZmlybXdhcmUgZWRpZCB2YWxpZGF0 aW9uLgoKdjI6IG1vdmUgZmlybXdhcmUgbG9hZGluZyB0byBjb3JlCgpTaWduZWQtb2ZmLWJ5OiBK YW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9L Y29uZmlnICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlICAgICAg ICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYyAgICAgICAgIHwgMTUgKysr KysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jIHwgMTkgKy0t LS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAyMCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vS2NvbmZpZyBiL2RyaXZl cnMvZ3B1L2RybS9LY29uZmlnCmluZGV4IDkwYmM2NWQwN2EzNS4uZjk4M2VmNjAyOTljIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vS2NvbmZpZworKysgYi9kcml2ZXJzL2dwdS9kcm0vS2Nv bmZpZwpAQCAtMTAxLDcgKzEwMSw3IEBAIGNvbmZpZyBEUk1fRkJERVZfRU1VTEFUSU9OCiAKIGNv bmZpZyBEUk1fTE9BRF9FRElEX0ZJUk1XQVJFCiAJYm9vbCAiQWxsb3cgdG8gc3BlY2lmeSBhbiBF RElEIGRhdGEgc2V0IGluc3RlYWQgb2YgcHJvYmluZyBmb3IgaXQiCi0JZGVwZW5kcyBvbiBEUk1f S01TX0hFTFBFUgorCWRlcGVuZHMgb24gRFJNCiAJaGVscAogCSAgU2F5IFkgaGVyZSwgaWYgeW91 IHdhbnQgdG8gdXNlIEVESUQgZGF0YSB0byBiZSBsb2FkZWQgZnJvbSB0aGUKIAkgIC9saWIvZmly bXdhcmUgZGlyZWN0b3J5IG9yIG9uZSBvZiB0aGUgcHJvdmlkZWQgYnVpbHQtaW4KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZSBiL2RyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZQpp bmRleCA5MmRlMzk5MWZhNTYuLmExMGFjMDk1NjA4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL01ha2VmaWxlCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZQpAQCAtMjcsMTMgKzI3 LDEzIEBAIGRybS0kKENPTkZJR19EUk1fUEFORUwpICs9IGRybV9wYW5lbC5vCiBkcm0tJChDT05G SUdfT0YpICs9IGRybV9vZi5vCiBkcm0tJChDT05GSUdfQUdQKSArPSBkcm1fYWdwc3VwcG9ydC5v CiBkcm0tJChDT05GSUdfREVCVUdfRlMpICs9IGRybV9kZWJ1Z2ZzLm8gZHJtX2RlYnVnZnNfY3Jj Lm8KK2RybS0kKENPTkZJR19EUk1fTE9BRF9FRElEX0ZJUk1XQVJFKSArPSBkcm1fZWRpZF9sb2Fk Lm8KIAogZHJtX2ttc19oZWxwZXIteSA6PSBkcm1fY3J0Y19oZWxwZXIubyBkcm1fZHBfaGVscGVy Lm8gZHJtX3Byb2JlX2hlbHBlci5vIFwKIAkJZHJtX3BsYW5lX2hlbHBlci5vIGRybV9kcF9tc3Rf dG9wb2xvZ3kubyBkcm1fYXRvbWljX2hlbHBlci5vIFwKIAkJZHJtX2ttc19oZWxwZXJfY29tbW9u Lm8gZHJtX2RwX2R1YWxfbW9kZV9oZWxwZXIubyBcCiAJCWRybV9zaW1wbGVfa21zX2hlbHBlci5v IGRybV9tb2Rlc2V0X2hlbHBlci5vCiAKLWRybV9rbXNfaGVscGVyLSQoQ09ORklHX0RSTV9MT0FE X0VESURfRklSTVdBUkUpICs9IGRybV9lZGlkX2xvYWQubwogZHJtX2ttc19oZWxwZXItJChDT05G SUdfRFJNX0ZCREVWX0VNVUxBVElPTikgKz0gZHJtX2ZiX2hlbHBlci5vCiBkcm1fa21zX2hlbHBl ci0kKENPTkZJR19EUk1fS01TX0NNQV9IRUxQRVIpICs9IGRybV9mYl9jbWFfaGVscGVyLm8KIGRy bV9rbXNfaGVscGVyLSQoQ09ORklHX0RSTV9EUF9BVVhfQ0hBUkRFVikgKz0gZHJtX2RwX2F1eF9k ZXYubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2VkaWQuYwppbmRleCBlMTc0M2FiMjc2ZGMuLjQwMDc5OThkNWNlMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9lZGlkLmMKQEAgLTEzMDksNiArMTMwOSwxMCBAQCBzdGF0aWMgdm9pZCBjb25uZWN0b3JfYmFk X2VkaWQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKICAqIGxldmVsLCBkcml2ZXJz IG11c3QgbWFrZSBhbGwgcmVhc29uYWJsZSBlZmZvcnRzIHRvIGV4cG9zZSBpdCBhcyBhbiBJMkMK ICAqIGFkYXB0ZXIgYW5kIHVzZSBkcm1fZ2V0X2VkaWQoKSBpbnN0ZWFkIG9mIGFidXNpbmcgdGhp cyBmdW5jdGlvbi4KICAqCisgKiBUaGUgRURJRCBtYXkgYmUgb3ZlcnJpZGRlbiB1c2luZyBkZWJ1 Z2ZzIG92ZXJyaWRlX2VkaWQgb3IgZmlybWFyZSBFRElECisgKiAoZHJtX2xvYWRfZWRpZF9maXJt d2FyZSgpKSwgaW4gdGhpcyBwcmlvcml0eSBvcmRlci4gSGF2aW5nIGVpdGhlciBvZiB0aGVtCisg KiBieXBhc3NlcyBhY3R1YWwgRURJRCByZWFkcy4KKyAqCiAgKiBSZXR1cm46IFBvaW50ZXIgdG8g dmFsaWQgRURJRCBvciBOVUxMIGlmIHdlIGNvdWxkbid0IGZpbmQgYW55LgogICovCiBzdHJ1Y3Qg ZWRpZCAqZHJtX2RvX2dldF9lZGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCkBA IC0xMzE4LDYgKzEzMjIsMTcgQEAgc3RydWN0IGVkaWQgKmRybV9kb19nZXRfZWRpZChzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogewogCWludCBpLCBqID0gMCwgdmFsaWRfZXh0ZW5z aW9ucyA9IDA7CiAJdTggKmVkaWQsICpuZXc7CisJc3RydWN0IGVkaWQgKm92ZXJyaWRlID0gTlVM TDsKKworCWlmIChjb25uZWN0b3ItPm92ZXJyaWRlX2VkaWQpCisJCW92ZXJyaWRlID0gZHJtX2Vk aWRfZHVwbGljYXRlKChjb25zdCBzdHJ1Y3QgZWRpZCAqKQorCQkJCQkgICAgICBjb25uZWN0b3It PmVkaWRfYmxvYl9wdHItPmRhdGEpOworCisJaWYgKCFvdmVycmlkZSkKKwkJb3ZlcnJpZGUgPSBk cm1fbG9hZF9lZGlkX2Zpcm13YXJlKGNvbm5lY3Rvcik7CisKKwlpZiAoIUlTX0VSUl9PUl9OVUxM KG92ZXJyaWRlKSkKKwkJcmV0dXJuIG92ZXJyaWRlOwogCiAJaWYgKChlZGlkID0ga21hbGxvYyhF RElEX0xFTkdUSCwgR0ZQX0tFUk5FTCkpID09IE5VTEwpCiAJCXJldHVybiBOVUxMOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcm9iZV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fcHJvYmVfaGVscGVyLmMKaW5kZXggMzU4OTU3MTE4Y2E5Li44NzEzMjZjYmM0NjUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvYmVfaGVscGVyLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9wcm9iZV9oZWxwZXIuYwpAQCAtMTk5LDggKzE5OSw2IEBAIGRybV9jb25u ZWN0b3JfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2Up CiAgKiAgICBkcm1fbW9kZV9wcm9iZWRfYWRkKCkuIE5ldyBtb2RlcyBzdGFydCB0aGVpciBsaWZl IHdpdGggc3RhdHVzIGFzIE9LLgogICogICAgTW9kZXMgYXJlIGFkZGVkIGZyb20gYSBzaW5nbGUg c291cmNlIHVzaW5nIHRoZSBmb2xsb3dpbmcgcHJpb3JpdHkgb3JkZXIuCiAgKgotICogICAgLSBk ZWJ1Z2ZzICdvdmVycmlkZV9lZGlkJyAodXNlZCBmb3IgdGVzdGluZyBvbmx5KQotICogICAgLSBm aXJtd2FyZSBFRElEIChkcm1fbG9hZF9lZGlkX2Zpcm13YXJlKCkpCiAgKiAgICAtICZkcm1fY29u bmVjdG9yX2hlbHBlcl9mdW5jcy5nZXRfbW9kZXMgdmZ1bmMKICAqICAgIC0gaWYgdGhlIGNvbm5l Y3RvciBzdGF0dXMgaXMgY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQsIHN0YW5kYXJkCiAgKiAg ICAgIFZFU0EgRE1UIG1vZGVzIHVwIHRvIDEwMjR4NzY4IGFyZSBhdXRvbWF0aWNhbGx5IGFkZGVk CkBAIC0zMDUsMjIgKzMwMyw3IEBAIGludCBkcm1faGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0 b3JfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJZ290byBwcnVuZTsK IAl9CiAKLQlpZiAoY29ubmVjdG9yLT5vdmVycmlkZV9lZGlkKSB7Ci0JCXN0cnVjdCBlZGlkICpl ZGlkID0gKHN0cnVjdCBlZGlkICopIGNvbm5lY3Rvci0+ZWRpZF9ibG9iX3B0ci0+ZGF0YTsKLQot CQljb3VudCA9IGRybV9hZGRfZWRpZF9tb2Rlcyhjb25uZWN0b3IsIGVkaWQpOwotCQlkcm1fZWRp ZF90b19lbGQoY29ubmVjdG9yLCBlZGlkKTsKLQl9IGVsc2UgewotCQlzdHJ1Y3QgZWRpZCAqZWRp ZCA9IGRybV9sb2FkX2VkaWRfZmlybXdhcmUoY29ubmVjdG9yKTsKLQkJaWYgKCFJU19FUlJfT1Jf TlVMTChlZGlkKSkgewotCQkJZHJtX21vZGVfY29ubmVjdG9yX3VwZGF0ZV9lZGlkX3Byb3BlcnR5 KGNvbm5lY3RvciwgZWRpZCk7Ci0JCQljb3VudCA9IGRybV9hZGRfZWRpZF9tb2Rlcyhjb25uZWN0 b3IsIGVkaWQpOwotCQkJZHJtX2VkaWRfdG9fZWxkKGNvbm5lY3RvciwgZWRpZCk7Ci0JCQlrZnJl ZShlZGlkKTsKLQkJfQotCQlpZiAoY291bnQgPT0gMCkKLQkJCWNvdW50ID0gKCpjb25uZWN0b3Jf ZnVuY3MtPmdldF9tb2RlcykoY29ubmVjdG9yKTsKLQl9CisJY291bnQgPSAoKmNvbm5lY3Rvcl9m dW5jcy0+Z2V0X21vZGVzKShjb25uZWN0b3IpOwogCiAJaWYgKGNvdW50ID09IDAgJiYgY29ubmVj dG9yLT5zdGF0dXMgPT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQpCiAJCWNvdW50ID0gZHJt X2FkZF9tb2Rlc19ub2VkaWQoY29ubmVjdG9yLCAxMDI0LCA3NjgpOwotLSAKMi4xLjQKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=