From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Weinehall Subject: [PATCH] Revert "drm/i915: Check live status before reading edid" Date: Wed, 17 Aug 2016 15:47:48 +0300 Message-ID: <20160817124748.31208-1-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id ED89C6E879 for ; Wed, 17 Aug 2016 12:47:47 +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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCAyMzdlZDg2YzY5M2Q4YThlNGRiNDc2OTc2YWViMzBkZjRkZWFj NzRiLgoKT3VyIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gb2YgbGl2ZSBzdGF0dXMgY2hlY2sgKHJl cGVhdCA5IHRpbWVzCndpdGggMTBtcyBkZWxheXMgYmV0d2VlbiBlYWNoIGF0dGVtcHQgYXMgYSB3 b3JrYXJvdW5kIGZvcgpidWdneSBkaXNwbGF5cykgaW1wb3NlcyBhIHJhdGhlciBzZXJpb3VzIHBl bmFsdHksIHRpbWUgd2lzZSwKb24gaW50ZWxfaGRtaV9kZXRlY3QoKS4gIFNpbmNlIHdlIHdlIGFs cmVhZHkgc2tpcCBsaXZlIHN0YXR1cwpjaGVja3Mgb24gcGxhdGZvcm1zIGJlZm9yZSBnZW4gNywg YW5kIHNpbmNlIHdlIHNlZW0gdG8gaGF2ZQpjb3BlZCBxdWl0ZSB3ZWxsIGJlZm9yZSB0aGUgbGl2 ZSBzdGF0dXMgY2hlY2sgd2FzIGludHJvZHVjZWQKZm9yIG5ld2VyIHBsYXRmb3JtcyB0b28sIHRo ZSBwcmV2aW91cyBiZWhhdmlvdXIgaXMgcHJvYmFibHkKcHJlZmVyYWJsZSwgYXQgbGVhc3QgdW5s ZXNzIHNvbWVvbmUgY2FuIHBvaW50IHRvIGEgdXNlLWNhc2UKdGhhdCB0aGUgbGl2ZSBzdGF0dXMg Y2hlY2sgaW1wcm92ZXMgKGFwYXJ0IGZyb20gIkJzcGVjIHNheXMgc28iLgoKU2lnbmVkLW9mZi1i eTogRGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgfCAgMiAtLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf aGRtaS5jIHwgNDMgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZp bGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jCmluZGV4IDM2NGRiOTA4YzE5MS4uZGNkODM1OTExMWJlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKQEAgLTQxNzEsNyArNDE3MSw3IEBAIHN0YXRpYyBib29sIGJ4dF9kaWdp dGFsX3BvcnRfY29ubmVjdGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKICAq CiAgKiBSZXR1cm4gJXRydWUgaWYgQHBvcnQgaXMgY29ubmVjdGVkLCAlZmFsc2Ugb3RoZXJ3aXNl LgogICovCi1ib29sIGludGVsX2RpZ2l0YWxfcG9ydF9jb25uZWN0ZWQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAorc3RhdGljIGJvb2wgaW50ZWxfZGlnaXRhbF9wb3J0X2Nvbm5l Y3RlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCSBzdHJ1Y3QgaW50 ZWxfZGlnaXRhbF9wb3J0ICpwb3J0KQogewogCWlmIChIQVNfUENIX0lCWChkZXZfcHJpdikpCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDFjNzAwYjBjM2NlYS4uYTgxYmE3NWQyM2YzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTQwMCw4ICsxNDAwLDYgQEAgdm9pZCBpbnRl bF9lZHBfZHJyc19pbnZhbGlkYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAkJCSAgICAgICB1bnNpZ25lZCBpbnQgZnJvbnRidWZmZXJfYml0cyk7CiB2b2lkIGludGVsX2Vk cF9kcnJzX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgdW5z aWduZWQgaW50IGZyb250YnVmZmVyX2JpdHMpOwotYm9vbCBpbnRlbF9kaWdpdGFsX3BvcnRfY29u bmVjdGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkgIHN0cnVjdCBp bnRlbF9kaWdpdGFsX3BvcnQgKnBvcnQpOwogCiB2b2lkCiBpbnRlbF9kcF9wcm9ncmFtX2xpbmtf dHJhaW5pbmdfcGF0dGVybihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfaGRtaS5jCmluZGV4IDRkZjlmMzg0OTEwYy4uYzNhYTllNjcwZDE1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfaGRtaS5jCkBAIC0xNDIyLDI0ICsxNDIyLDIyIEBAIGludGVsX2hkbWlfZHBf ZHVhbF9tb2RlX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGhh c19lZGlkKQogfQogCiBzdGF0aWMgYm9vbAotaW50ZWxfaGRtaV9zZXRfZWRpZChzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQoraW50ZWxfaGRtaV9zZXRfZWRpZChz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY29ubmVjdG9yLT5kZXYpOwogCXN0cnVjdCBpbnRlbF9o ZG1pICppbnRlbF9oZG1pID0gaW50ZWxfYXR0YWNoZWRfaGRtaShjb25uZWN0b3IpOwotCXN0cnVj dCBlZGlkICplZGlkID0gTlVMTDsKKwlzdHJ1Y3QgZWRpZCAqZWRpZDsKIAlib29sIGNvbm5lY3Rl ZCA9IGZhbHNlOwogCi0JaWYgKGZvcmNlKSB7Ci0JCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRl dl9wcml2LCBQT1dFUl9ET01BSU5fR01CVVMpOworCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRl dl9wcml2LCBQT1dFUl9ET01BSU5fR01CVVMpOwogCi0JCWVkaWQgPSBkcm1fZ2V0X2VkaWQoY29u bmVjdG9yLAotCQkJCSAgICBpbnRlbF9nbWJ1c19nZXRfYWRhcHRlcihkZXZfcHJpdiwKLQkJCQkg ICAgaW50ZWxfaGRtaS0+ZGRjX2J1cykpOworCWVkaWQgPSBkcm1fZ2V0X2VkaWQoY29ubmVjdG9y LAorCQkJICAgIGludGVsX2dtYnVzX2dldF9hZGFwdGVyKGRldl9wcml2LAorCQkJICAgIGludGVs X2hkbWktPmRkY19idXMpKTsKIAotCQlpbnRlbF9oZG1pX2RwX2R1YWxfbW9kZV9kZXRlY3QoY29u bmVjdG9yLCBlZGlkICE9IE5VTEwpOworCWludGVsX2hkbWlfZHBfZHVhbF9tb2RlX2RldGVjdChj b25uZWN0b3IsIGVkaWQgIT0gTlVMTCk7CiAKLQkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2 X3ByaXYsIFBPV0VSX0RPTUFJTl9HTUJVUyk7Ci0JfQorCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0 KGRldl9wcml2LCBQT1dFUl9ET01BSU5fR01CVVMpOwogCiAJdG9faW50ZWxfY29ubmVjdG9yKGNv bm5lY3RvciktPmRldGVjdF9lZGlkID0gZWRpZDsKIAlpZiAoZWRpZCAmJiBlZGlkLT5pbnB1dCAm IERSTV9FRElEX0lOUFVUX0RJR0lUQUwpIHsKQEAgLTE0NjUsMzcgKzE0NjMsMTYgQEAgc3RhdGlj IGVudW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMKIGludGVsX2hkbWlfZGV0ZWN0KHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiB7CiAJZW51bSBkcm1fY29ubmVjdG9y X3N0YXR1cyBzdGF0dXM7Ci0Jc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBpbnRlbF9h dHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShjb25uZWN0b3ItPmRldik7Ci0JYm9vbCBsaXZlX3N0YXR1cyA9IGZhbHNl OwotCXVuc2lnbmVkIGludCB0cnk7CiAKIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVz XVxuIiwKIAkJICAgICAgY29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUpOwogCiAJ aW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9HTUJVUyk7CiAK LQlmb3IgKHRyeSA9IDA7ICFsaXZlX3N0YXR1cyAmJiB0cnkgPCA5OyB0cnkrKykgewotCQlpZiAo dHJ5KQotCQkJbXNsZWVwKDEwKTsKLQkJbGl2ZV9zdGF0dXMgPSBpbnRlbF9kaWdpdGFsX3BvcnRf Y29ubmVjdGVkKGRldl9wcml2LAotCQkJCWhkbWlfdG9fZGlnX3BvcnQoaW50ZWxfaGRtaSkpOwot CX0KLQotCWlmICghbGl2ZV9zdGF0dXMpIHsKLQkJRFJNX0RFQlVHX0tNUygiSERNSSBsaXZlIHN0 YXR1cyBkb3duXG4iKTsKLQkJLyoKLQkJICogTGl2ZSBzdGF0dXMgcmVnaXN0ZXIgaXMgbm90IHJl bGlhYmxlIG9uIGFsbCBpbnRlbCBwbGF0Zm9ybXMuCi0JCSAqIFNvIGNvbnNpZGVyIGxpdmVfc3Rh dHVzIG9ubHkgZm9yIGNlcnRhaW4gcGxhdGZvcm1zLCBmb3IKLQkJICogb3RoZXJzLCByZWFkIEVE SUQgdG8gZGV0ZXJtaW5lIHByZXNlbmNlIG9mIHNpbmsuCi0JCSAqLwotCQlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbiA8IDcgfHwgSVNfSVZZQlJJREdFKGRldl9wcml2KSkKLQkJCWxpdmVf c3RhdHVzID0gdHJ1ZTsKLQl9Ci0KIAlpbnRlbF9oZG1pX3Vuc2V0X2VkaWQoY29ubmVjdG9yKTsK IAotCWlmIChpbnRlbF9oZG1pX3NldF9lZGlkKGNvbm5lY3RvciwgbGl2ZV9zdGF0dXMpKSB7CisJ aWYgKGludGVsX2hkbWlfc2V0X2VkaWQoY29ubmVjdG9yKSkgewogCQlzdHJ1Y3QgaW50ZWxfaGRt aSAqaW50ZWxfaGRtaSA9IGludGVsX2F0dGFjaGVkX2hkbWkoY29ubmVjdG9yKTsKIAogCQloZG1p X3RvX2RpZ19wb3J0KGludGVsX2hkbWkpLT5iYXNlLnR5cGUgPSBJTlRFTF9PVVRQVVRfSERNSTsK QEAgLTE1MjEsNyArMTQ5OCw3IEBAIGludGVsX2hkbWlfZm9yY2Uoc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvcikKIAlpZiAoY29ubmVjdG9yLT5zdGF0dXMgIT0gY29ubmVjdG9yX3N0YXR1 c19jb25uZWN0ZWQpCiAJCXJldHVybjsKIAotCWludGVsX2hkbWlfc2V0X2VkaWQoY29ubmVjdG9y LCB0cnVlKTsKKwlpbnRlbF9oZG1pX3NldF9lZGlkKGNvbm5lY3Rvcik7CiAJaGRtaV90b19kaWdf cG9ydChpbnRlbF9oZG1pKS0+YmFzZS50eXBlID0gSU5URUxfT1VUUFVUX0hETUk7CiB9CiAKLS0g CjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK