From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH 1/2] drm/dp/mst: Reprobe EDID for MST ports on resume Date: Thu, 19 May 2016 10:19:55 -0400 Message-ID: <1463667596-25236-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Dave Airlie Cc: Lyude , open list , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org QXMgb2JzZXJ2ZWQgd2l0aCB0aGUgbGF0ZXN0IFRoaW5rUGFkIGRvY2tzLCB3ZSB1bmZvcnR1bmF0 ZWx5IGNhbid0IHJlbHkKb24gZG9ja3Mga2VlcGluZyB1cyB1cGRhdGVkIHdpdGggaG90cGx1ZyBl dmVudHMgdGhhdCBoYXBwZW5lZCB3aGlsZSB3ZQp3ZXJlIHN1c3BlbmRlZC4gT24gdG9wIG9mIHRo YXQsIGV2ZW4gaWYgdGhlIG51bWJlciBvZiBjb25uZWN0b3JzIHJlbWFpbnMKdGhlIHNhbWUgYmV0 d2VlbiBzdXNwZW5kIGFuZCByZXN1bWUgaXQncyBzdGlsbCBub3Qgc2FmZSB0byBhc3N1bWUgdGhh dAp0aGVyZSB3ZXJlIG5vIGhvdHBsdWdzLCBzaW5jZSBhIGRpZmZlcmVudCBtb25pdG9yIG1pZ2h0 IGhhdmUgYmVlbgpwbHVnZ2VkIGludG8gYSBwb3J0IGFub3RoZXIgbW9uaXRvciBwcmV2aW91c2x5 IG9jY3VwaWVkLiBBcyBzdWNoLCB3ZQpuZWVkIHRvIGdvIHRocm91Z2ggYWxsIG9mIHRoZSBNU1Qg cG9ydHMgYW5kIGNoZWNrIHdoZXRoZXIgb3Igbm90IHRoZWlyCkVESURzIGhhdmUgY2hhbmdlZC4K CkluIGFkZGl0aW9uIHRvIHRoYXQsIHdlIGFsc28gbm93IHJldHVybiAtRUlOVkFMIGZyb20KZHJt X2RwX21zdF90b3BvbG9neV9tZ3JfcmVzdW1lIHRvIGluZGljYXRlIHRvIGNhbGxlcnMgdGhhdCB0 aGV5IG5lZWQgdG8KcmVzZXQgdGhlIE1TVCBjb25uZWN0aW9uLCBhbmQgdGhhdCB0aGV5IGNhbid0 IHJlbHkgb24gYW55IG90aGVyIG1ldGhvZApvZiByZXByb2JpbmcuCgpDYzogc3RhYmxlQHZnZXIu a2VybmVsLm9yZwpTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vZHJtX2RwX21zdF90b3BvbG9neS5jIHwgOTIgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA5MSBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9tc3RfdG9w b2xvZ3kuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMKaW5kZXggNzFl YTA1Mi4uY2M2OGM3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9tc3RfdG9w b2xvZ3kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2RwX21zdF90b3BvbG9neS5jCkBAIC0y OSw2ICsyOSw3IEBACiAjaW5jbHVkZSA8bGludXgvaTJjLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9k cF9tc3RfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KKyNpbmNsdWRlIDxkcm0vZHJt X2VkaWQuaD4KIAogI2luY2x1ZGUgPGRybS9kcm1fZml4ZWQuaD4KIApAQCAtMjExOCw2ICsyMTE5 LDYyIEBAIHZvaWQgZHJtX2RwX21zdF90b3BvbG9neV9tZ3Jfc3VzcGVuZChzdHJ1Y3QgZHJtX2Rw X21zdF90b3BvbG9neV9tZ3IgKm1ncikKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2RwX21zdF90b3Bv bG9neV9tZ3Jfc3VzcGVuZCk7CiAKK3N0YXRpYyBib29sIGRybV9kcF9tc3RfZWRpZHNfY2hhbmdl ZChzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKKwkJCQkgICAgIHN0cnVjdCBk cm1fZHBfbXN0X3BvcnQgKnBvcnQpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldjsKKwlzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCXN0cnVjdCBkcm1fZHBfbXN0X3BvcnQgKmRw b3J0OworCXN0cnVjdCBkcm1fZHBfbXN0X2JyYW5jaCAqbXN0YjsKKwlzdHJ1Y3QgZWRpZCAqY3Vy cmVudF9lZGlkLCAqY2FjaGVkX2VkaWQ7CisJYm9vbCByZXQgPSBmYWxzZTsKKworCXBvcnQgPSBk cm1fZHBfZ2V0X3ZhbGlkYXRlZF9wb3J0X3JlZihtZ3IsIHBvcnQpOworCWlmICghcG9ydCkKKwkJ cmV0dXJuIGZhbHNlOworCisJbXN0YiA9IGRybV9kcF9nZXRfdmFsaWRhdGVkX21zdGJfcmVmKG1n ciwgcG9ydC0+bXN0Yik7CisJaWYgKG1zdGIpIHsKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShkcG9y dCwgJnBvcnQtPm1zdGItPnBvcnRzLCBuZXh0KSB7CisJCQlyZXQgPSBkcm1fZHBfbXN0X2VkaWRz X2NoYW5nZWQobWdyLCBkcG9ydCk7CisJCQlpZiAocmV0KQorCQkJCWJyZWFrOworCQl9CisKKwkJ ZHJtX2RwX3B1dF9tc3RfYnJhbmNoX2RldmljZShtc3RiKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8g b3V0OworCX0KKworCWNvbm5lY3RvciA9IHBvcnQtPmNvbm5lY3RvcjsKKwlpZiAoIWNvbm5lY3Rv ciB8fCAhcG9ydC0+YXV4LmRkYy5hbGdvKQorCQlnb3RvIG91dDsKKworCWRldiA9IGNvbm5lY3Rv ci0+ZGV2OworCW11dGV4X2xvY2soJmRldi0+bW9kZV9jb25maWcubXV0ZXgpOworCisJY3VycmVu dF9lZGlkID0gZHJtX2dldF9lZGlkKGNvbm5lY3RvciwgJnBvcnQtPmF1eC5kZGMpOworCWNhY2hl ZF9lZGlkID0gKHZvaWQqKWNvbm5lY3Rvci0+ZWRpZF9ibG9iX3B0ci0+ZGF0YTsKKworCWlmICgo Y3VycmVudF9lZGlkICYmIGNhY2hlZF9lZGlkICYmIG1lbWNtcChjdXJyZW50X2VkaWQsIGNhY2hl ZF9lZGlkLAorCQkJCQkJICAgc2l6ZW9mKHN0cnVjdCBlZGlkKSkgIT0gMCkgfHwKKwkgICAgKCFj dXJyZW50X2VkaWQgJiYgY2FjaGVkX2VkaWQpIHx8IChjdXJyZW50X2VkaWQgJiYgIWNhY2hlZF9l ZGlkKSkgeworCQlyZXQgPSB0cnVlOworCQlEUk1fREVCVUdfS01TKCJFRElEIG9uICVzIGNoYW5n ZWQsIHJlcHJvYmluZyBjb25uZWN0b3JzXG4iLAorCQkJICAgICAgY29ubmVjdG9yLT5uYW1lKTsK Kwl9CisKKwltdXRleF91bmxvY2soJmRldi0+bW9kZV9jb25maWcubXV0ZXgpOworCisJaWYgKGN1 cnJlbnRfZWRpZCkKKwkJa2ZyZWUoY3VycmVudF9lZGlkKTsKKworb3V0OgorCWRybV9kcF9wdXRf cG9ydChwb3J0KTsKKworCXJldHVybiByZXQ7Cit9CisKIC8qKgogICogZHJtX2RwX21zdF90b3Bv bG9neV9tZ3JfcmVzdW1lKCkgLSByZXN1bWUgdGhlIE1TVCBtYW5hZ2VyCiAgKiBAbWdyOiBtYW5h Z2VyIHRvIHJlc3VtZQpAQCAtMjEyNyw5ICsyMTg0LDE1IEBAIEVYUE9SVF9TWU1CT0woZHJtX2Rw X21zdF90b3BvbG9neV9tZ3Jfc3VzcGVuZCk7CiAgKgogICogaWYgdGhlIGRldmljZSBmYWlscyB0 aGlzIHJldHVybnMgLTEsIGFuZCB0aGUgZHJpdmVyIHNob3VsZCBkbwogICogYSBmdWxsIE1TVCBy ZXByb2JlLCBpbiBjYXNlIHdlIHdlcmUgdW5kb2NrZWQuCisgKgorICogaWYgdGhlIGRldmljZSBj YW4gbm8gbG9uZ2VyIGJlIHRydXN0ZWQsIHRoaXMgcmV0dXJucyAtRUlOVkFMCisgKiBhbmQgdGhl IGRyaXZlciBzaG91bGQgdW5jb25kaXRpb25hbGx5IGRpc2Nvbm5lY3QgYW5kIHJlY29ubmVjdAor ICogdGhlIGRvY2suCiAgKi8KIGludCBkcm1fZHBfbXN0X3RvcG9sb2d5X21ncl9yZXN1bWUoc3Ry dWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IpCiB7CisJc3RydWN0IGRybV9kcF9tc3Rf YnJhbmNoICptc3RiOworCXN0cnVjdCBkcm1fZHBfbXN0X3BvcnQgKnBvcnQ7CiAJaW50IHJldCA9 IDA7CiAKIAltdXRleF9sb2NrKCZtZ3ItPmxvY2spOwpAQCAtMjE2Myw4ICsyMjI2LDM1IEBAIGlu dCBkcm1fZHBfbXN0X3RvcG9sb2d5X21ncl9yZXN1bWUoc3RydWN0IGRybV9kcF9tc3RfdG9wb2xv Z3lfbWdyICptZ3IpCiAJCWRybV9kcF9jaGVja19tc3RiX2d1aWQobWdyLT5tc3RfcHJpbWFyeSwg Z3VpZCk7CiAKIAkJcmV0ID0gMDsKLQl9IGVsc2UKKworCQkvKgorCQkgKiBTb21lIGh1YnMgYWxz byBmb3JnZXQgdG8gbm90aWZ5IHVzIG9mIGhvdHBsdWdzIHRoYXQgaGFwcGVuZWQKKwkJICogd2hp bGUgd2Ugd2VyZSBpbiBzdXNwZW5kLCBzbyB3ZSBuZWVkIHRvIHZlcmlmeSB0aGF0IHRoZSBlZGlk CisJCSAqIGhhc24ndCBjaGFuZ2VkIGZvciBhbnkgb2YgdGhlIGNvbm5lY3RvcnMuIElmIGl0IGhh cyBiZWVuLAorCQkgKiB3ZSB1bmZvcnR1bmF0ZWx5IGNhbid0IHJlbHkgb24gdGhlIGRvY2sgdXBk YXRpbmcgdXMgd2l0aAorCQkgKiBob3RwbHVnIGV2ZW50cywgc28gaW5kaWNhdGUgd2UgbmVlZCBh IGZ1bGwgcmVjb25uZWN0LgorCQkgKi8KKworCQkvKiBNU1QncyBJMkMgaGVscGVycyBjYW4ndCBi ZSB1c2VkIHdoaWxlIGhvbGRpbmcgdGhpcyBsb2NrICovCisJCW11dGV4X3VubG9jaygmbWdyLT5s b2NrKTsKKworCQltc3RiID0gZHJtX2RwX2dldF92YWxpZGF0ZWRfbXN0Yl9yZWYobWdyLCBtZ3It Pm1zdF9wcmltYXJ5KTsKKwkJaWYgKG1zdGIpIHsKKwkJCWxpc3RfZm9yX2VhY2hfZW50cnkocG9y dCwgJm1zdGItPnBvcnRzLCBuZXh0KSB7CisJCQkJaWYgKGRybV9kcF9tc3RfZWRpZHNfY2hhbmdl ZChtZ3IsIHBvcnQpKSB7CisJCQkJCXJldCA9IC1FSU5WQUw7CisJCQkJCWJyZWFrOworCQkJCX0K KwkJCX0KKworCQkJZHJtX2RwX3B1dF9tc3RfYnJhbmNoX2RldmljZShtc3RiKTsKKwkJfQorCX0g ZWxzZSB7CiAJCXJldCA9IC0xOworCQltdXRleF91bmxvY2soJm1nci0+bG9jayk7CisJfQorCisJ cmV0dXJuIHJldDsKIAogb3V0X3VubG9jazoKIAltdXRleF91bmxvY2soJm1nci0+bG9jayk7Ci0t IAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==