From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH 3/3] drm: handle override edid and firmware adid
	at drm_do_get_edid()
Date: Thu, 16 Feb 2017 12:36:44 +0200
Message-ID: <061d86222ae43609c85141c59e30d0e5ae8aabd5.1487240619.git.jani.nikula@intel.com>
References: <cover.1487241304.git.jani.nikula@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <cover.1487241304.git.jani.nikula@intel.com>
In-Reply-To: <cover.1487240619.git.jani.nikula@intel.com>
References: <cover.1487240619.git.jani.nikula@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

SGFuZGxlIG92ZXJyaWRlIGVkaWQgYW5kIGZpcm13YXJlIGVkaWQgYXQgdGhlIGxvdyBsZXZlbCB0
byB0cmFuc3BhcmVudGx5CmFuZCBjb21wbGV0ZWx5IHJlcGxhY2UgdGhlIHJlYWwgZWRpZC4gVGhp
cyBhbHNvIHByZXZlbnRzIGFjdHVhbCBlZGlkCnJlYWRzIGZvciB0aGVtLCBidXQgcmV0YWlucyBk
ZGMgcHJvYmUuCgpGSVhNRTogdmFsaWRhdGUgb3ZlcnJpZGUgZWRpZCwgZGVkdXBsaWNhdGUgZmly
bXdhcmUgZWRpZCB2YWxpZGF0aW9uLgoKU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmku
bmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYyAgICAgICAg
IHwgMTUgKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5j
IHwgMTkgKy0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25z
KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Vk
aWQuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZC5jCmluZGV4IDM2MjAzNjM2MDcyNC4uMDU0
ZTJkNzRlYWZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYwpAQCAtMTMwOSw2ICsxMzA5LDEwIEBAIHN0YXRpYyB2
b2lkIGNvbm5lY3Rvcl9iYWRfZWRpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAog
ICogbGV2ZWwsIGRyaXZlcnMgbXVzdCBtYWtlIGFsbCByZWFzb25hYmxlIGVmZm9ydHMgdG8gZXhw
b3NlIGl0IGFzIGFuIEkyQwogICogYWRhcHRlciBhbmQgdXNlIGRybV9nZXRfZWRpZCgpIGluc3Rl
YWQgb2YgYWJ1c2luZyB0aGlzIGZ1bmN0aW9uLgogICoKKyAqIFRoZSBFRElEIG1heSBiZSBvdmVy
cmlkZGVuIHVzaW5nIGRlYnVnZnMgb3ZlcnJpZGVfZWRpZCBvciBmaXJtYXJlIEVESUQKKyAqIChk
cm1fbG9hZF9lZGlkX2Zpcm13YXJlKCkpLCBpbiB0aGlzIHByaW9yaXR5IG9yZGVyLiBIYXZpbmcg
ZWl0aGVyIG9mIHRoZW0KKyAqIGJ5cGFzc2VzIGFjdHVhbCBFRElEIHJlYWRzLgorICoKICAqIFJl
dHVybjogUG9pbnRlciB0byB2YWxpZCBFRElEIG9yIE5VTEwgaWYgd2UgY291bGRuJ3QgZmluZCBh
bnkuCiAgKi8KIHN0cnVjdCBlZGlkICpkcm1fZG9fZ2V0X2VkaWQoc3RydWN0IGRybV9jb25uZWN0
b3IgKmNvbm5lY3RvciwKQEAgLTEzMTgsNiArMTMyMiwxNyBAQCBzdHJ1Y3QgZWRpZCAqZHJtX2Rv
X2dldF9lZGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiB7CiAJaW50IGksIGog
PSAwLCB2YWxpZF9leHRlbnNpb25zID0gMDsKIAl1OCAqZWRpZCwgKm5ldzsKKwlzdHJ1Y3QgZWRp
ZCAqb3ZlcnJpZGUgPSBOVUxMOworCisJaWYgKGNvbm5lY3Rvci0+b3ZlcnJpZGVfZWRpZCkKKwkJ
b3ZlcnJpZGUgPSBkcm1fZWRpZF9kdXBsaWNhdGUoKGNvbnN0IHN0cnVjdCBlZGlkICopCisJCQkJ
CSAgICAgIGNvbm5lY3Rvci0+ZWRpZF9ibG9iX3B0ci0+ZGF0YSk7CisKKwlpZiAoIW92ZXJyaWRl
KQorCQlvdmVycmlkZSA9IGRybV9sb2FkX2VkaWRfZmlybXdhcmUoY29ubmVjdG9yKTsKKworCWlm
ICghSVNfRVJSX09SX05VTEwob3ZlcnJpZGUpKQorCQlyZXR1cm4gb3ZlcnJpZGU7CiAKIAlpZiAo
KGVkaWQgPSBrbWFsbG9jKEVESURfTEVOR1RILCBHRlBfS0VSTkVMKSkgPT0gTlVMTCkKIAkJcmV0
dXJuIE5VTEw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5j
IGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcm9iZV9oZWxwZXIuYwppbmRleCAzNTg5NTcxMThjYTku
Ljg3MTMyNmNiYzQ2NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcm9iZV9oZWxw
ZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jCkBAIC0xOTksOCAr
MTk5LDYgQEAgZHJtX2Nvbm5lY3Rvcl9kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l
Y3RvciwgYm9vbCBmb3JjZSkKICAqICAgIGRybV9tb2RlX3Byb2JlZF9hZGQoKS4gTmV3IG1vZGVz
IHN0YXJ0IHRoZWlyIGxpZmUgd2l0aCBzdGF0dXMgYXMgT0suCiAgKiAgICBNb2RlcyBhcmUgYWRk
ZWQgZnJvbSBhIHNpbmdsZSBzb3VyY2UgdXNpbmcgdGhlIGZvbGxvd2luZyBwcmlvcml0eSBvcmRl
ci4KICAqCi0gKiAgICAtIGRlYnVnZnMgJ292ZXJyaWRlX2VkaWQnICh1c2VkIGZvciB0ZXN0aW5n
IG9ubHkpCi0gKiAgICAtIGZpcm13YXJlIEVESUQgKGRybV9sb2FkX2VkaWRfZmlybXdhcmUoKSkK
ICAqICAgIC0gJmRybV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzLmdldF9tb2RlcyB2ZnVuYwogICog
ICAgLSBpZiB0aGUgY29ubmVjdG9yIHN0YXR1cyBpcyBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3Rl
ZCwgc3RhbmRhcmQKICAqICAgICAgVkVTQSBETVQgbW9kZXMgdXAgdG8gMTAyNHg3NjggYXJlIGF1
dG9tYXRpY2FsbHkgYWRkZWQKQEAgLTMwNSwyMiArMzAzLDcgQEAgaW50IGRybV9oZWxwZXJfcHJv
YmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y
LAogCQlnb3RvIHBydW5lOwogCX0KIAotCWlmIChjb25uZWN0b3ItPm92ZXJyaWRlX2VkaWQpIHsK
LQkJc3RydWN0IGVkaWQgKmVkaWQgPSAoc3RydWN0IGVkaWQgKikgY29ubmVjdG9yLT5lZGlkX2Js
b2JfcHRyLT5kYXRhOwotCi0JCWNvdW50ID0gZHJtX2FkZF9lZGlkX21vZGVzKGNvbm5lY3Rvciwg
ZWRpZCk7Ci0JCWRybV9lZGlkX3RvX2VsZChjb25uZWN0b3IsIGVkaWQpOwotCX0gZWxzZSB7Ci0J
CXN0cnVjdCBlZGlkICplZGlkID0gZHJtX2xvYWRfZWRpZF9maXJtd2FyZShjb25uZWN0b3IpOwot
CQlpZiAoIUlTX0VSUl9PUl9OVUxMKGVkaWQpKSB7Ci0JCQlkcm1fbW9kZV9jb25uZWN0b3JfdXBk
YXRlX2VkaWRfcHJvcGVydHkoY29ubmVjdG9yLCBlZGlkKTsKLQkJCWNvdW50ID0gZHJtX2FkZF9l
ZGlkX21vZGVzKGNvbm5lY3RvciwgZWRpZCk7Ci0JCQlkcm1fZWRpZF90b19lbGQoY29ubmVjdG9y
LCBlZGlkKTsKLQkJCWtmcmVlKGVkaWQpOwotCQl9Ci0JCWlmIChjb3VudCA9PSAwKQotCQkJY291
bnQgPSAoKmNvbm5lY3Rvcl9mdW5jcy0+Z2V0X21vZGVzKShjb25uZWN0b3IpOwotCX0KKwljb3Vu
dCA9ICgqY29ubmVjdG9yX2Z1bmNzLT5nZXRfbW9kZXMpKGNvbm5lY3Rvcik7CiAKIAlpZiAoY291
bnQgPT0gMCAmJiBjb25uZWN0b3ItPnN0YXR1cyA9PSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3Rl
ZCkKIAkJY291bnQgPSBkcm1fYWRkX21vZGVzX25vZWRpZChjb25uZWN0b3IsIDEwMjQsIDc2OCk7
Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4
Cg==