From: Lyude Paul Subject: [PATCH] drm/nouveau: Fix nouveau_connector_ddc_detect() Date: Thu, 23 Aug 2018 18:27:49 -0400 Message-ID: <20180823222749.28659-1-lyude@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: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Ben Skeggs , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: dri-devel@lists.freedesktop.org SXQgbG9va3MgbGlrZSB0aGF0IHdoZW4gd2UgbW92ZWQgb3ZlciB0byB1c2luZwpkcm1fY29ubmVj dG9yX2Zvcl9lYWNoX3Bvc3NpYmxlX2VuY29kZXIoKSBpbiBub3V2ZWF1LCB0aGF0IG9uZSByYXRo ZXIKaW1wb3J0YW50IHBhcnQgb2YgdGhpcyBmdW5jdGlvbiBnb3QgZHJvcHBlZCBieSBhY2NpZGVu dDoKCgkvKiAgICAgICAgICBSaWdodCAgIHYgICBoZXJlICovCglmb3IgKGkgPSAwOyBudl9lbmNv ZGVyID0gTlVMTCwgaSA8IERSTV9DT05ORUNUT1JfTUFYX0VOQ09ERVI7IGkrKykgewoJCWludCBp ZCA9IGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV07CgkJaWYgKGlkID09IDApCgkJCWJyZWFrOwoK U2luY2UgaXQncyByYXRoZXIgZGlmZmljdWx0IHRvIG5vdGljZTogdGhlIGNvbmRpdGlvbmFsIGlu IHRoaXMgbG9vcCBpcwphY3R1YWxseToKCgludl9lbmNvZGVyID0gTlVMTCwgaSA8IERSTV9DT05O RUNUT1JfTUFYX0VOQ09ERVIKCk1lYW5pbmcgdGhhdCBhbGwgZWFybHkgYnJlYWtzIHJlc3VsdCBp biBudl9lbmNvZGVyIGtlZXBpbmcgaXQncyB2YWx1ZSwKb3RoZXJ3aXNlIG52X2VuY29kZXIgPSBO VUxMLiBVZ2guCgpTaW5jZSB0aGlzIGdvdCBkcm9wcGVkLCBub3V2ZWF1X2Nvbm5lY3Rvcl9kZGNf ZGV0ZWN0KCkgbm93IHJldHVybnMgYW4KZW5jb2RlciBmb3IgZXZlcnkgc2luZ2xlIGNvbm5lY3Rv ciwgcmVnYXJkbGVzcyBvZiB3aGV0aGVyIG9yIG5vdCBpdCdzCmRldGVjdGVkOgoKICAgIFsgMTc4 MC4wNTYxODVdIG5vdXZlYXUgMDAwMDowMTowMC4wOiBEUk06IEREQyByZXNwb25kZWQsIGJ1dCBu byBFRElEIGZvciBEUC0yCgpTbzogZml4IHRoaXMgdG8gZW5zdXJlIHdlIG9ubHkgcmV0dXJuIGFu IGVuY29kZXIgaWYgd2UgYWN0dWFsbHkgZm91bmQKb25lLCBhbmQgY2xlYW4gdXAgdGhlIHJlc3Qg b2YgdGhlIGZ1bmN0aW9uIHdoaWxlIHdlJ3JlIGF0IGl0IHNpbmNlIGl0J3MKbmVhcmx5IGltcG9z c2libGUgdG8gcmVhZCBwcm9wZXJseS4KClNpZ25lZC1vZmYtYnk6IEx5dWRlIFBhdWwgPGx5dWRl QHJlZGhhdC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgpGaXhlczogZGRiYTc2NmRkMDdlICgiZHJtL25vdXZlYXU6IFVzZSBkcm1fY29ubmVj dG9yX2Zvcl9lYWNoX3Bvc3NpYmxlX2VuY29kZXIoKSIpCi0tLQogZHJpdmVycy9ncHUvZHJtL25v dXZlYXUvbm91dmVhdV9jb25uZWN0b3IuYyB8IDUxICsrKysrKysrKysrKy0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfY29ubmVjdG9yLmMgYi9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Nvbm5lY3Rvci5jCmluZGV4IDNiMjg4YmU5YzNmNy4u NTFiNmY3NjJmMWUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1 X2Nvbm5lY3Rvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfY29ubmVj dG9yLmMKQEAgLTQxNCw5ICs0MTQsOSBAQCBub3V2ZWF1X2Nvbm5lY3Rvcl9kZGNfZGV0ZWN0KHN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJc3RydWN0IG5vdXZlYXVfY29ubmVjdG9y ICpudl9jb25uZWN0b3IgPSBub3V2ZWF1X2Nvbm5lY3Rvcihjb25uZWN0b3IpOwogCXN0cnVjdCBu b3V2ZWF1X2RybSAqZHJtID0gbm91dmVhdV9kcm0oZGV2KTsKIAlzdHJ1Y3QgbnZrbV9ncGlvICpn cGlvID0gbnZ4eF9ncGlvKCZkcm0tPmNsaWVudC5kZXZpY2UpOwotCXN0cnVjdCBub3V2ZWF1X2Vu Y29kZXIgKm52X2VuY29kZXIgPSBOVUxMOworCXN0cnVjdCBub3V2ZWF1X2VuY29kZXIgKm52X2Vu Y29kZXIgPSBOVUxMLCAqZm91bmQgPSBOVUxMOwogCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rl cjsKLQlpbnQgaSwgcGFuZWwgPSAtRU5PREVWOworCWludCBpLCByZXQsIHBhbmVsID0gLUVOT0RF VjsKIAogCS8qIGVEUCBwYW5lbHMgbmVlZCBwb3dlcmluZyBvbiBieSB1cyAoaWYgdGhlIFZCSU9T IGRvZXNuJ3QgZGVmYXVsdCBpdAogCSAqIHRvIG9uKSBiZWZvcmUgZG9pbmcgYW55IEFVWCBjaGFu bmVsIHRyYW5zYWN0aW9ucy4gIExWRFMgcGFuZWwgcG93ZXIKQEAgLTQzMywzNyArNDMzLDQ2IEBA IG5vdXZlYXVfY29ubmVjdG9yX2RkY19kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvcikKIAlkcm1fY29ubmVjdG9yX2Zvcl9lYWNoX3Bvc3NpYmxlX2VuY29kZXIoY29ubmVjdG9y LCBlbmNvZGVyLCBpKSB7CiAJCW52X2VuY29kZXIgPSBub3V2ZWF1X2VuY29kZXIoZW5jb2Rlcik7 CiAKLQkJaWYgKG52X2VuY29kZXItPmRjYi0+dHlwZSA9PSBEQ0JfT1VUUFVUX0RQKSB7Ci0JCQlp bnQgcmV0ID0gbm91dmVhdV9kcF9kZXRlY3QobnZfZW5jb2Rlcik7CisJCXN3aXRjaCAobnZfZW5j b2Rlci0+ZGNiLT50eXBlKSB7CisJCWNhc2UgRENCX09VVFBVVF9EUDoKKwkJCXJldCA9IG5vdXZl YXVfZHBfZGV0ZWN0KG52X2VuY29kZXIpOwogCQkJaWYgKHJldCA9PSBOT1VWRUFVX0RQX01TVCkK IAkJCQlyZXR1cm4gTlVMTDsKLQkJCWlmIChyZXQgPT0gTk9VVkVBVV9EUF9TU1QpCi0JCQkJYnJl YWs7Ci0JCX0gZWxzZQotCQlpZiAoKHZnYV9zd2l0Y2hlcm9vX2hhbmRsZXJfZmxhZ3MoKSAmCi0J CSAgICAgVkdBX1NXSVRDSEVST09fQ0FOX1NXSVRDSF9EREMpICYmCi0JCSAgICBudl9lbmNvZGVy LT5kY2ItPnR5cGUgPT0gRENCX09VVFBVVF9MVkRTICYmCi0JCSAgICBudl9lbmNvZGVyLT5pMmMp IHsKLQkJCWludCByZXQ7CisJCQllbHNlIGlmIChyZXQgPT0gTk9VVkVBVV9EUF9TU1QpCisJCQkJ Zm91bmQgPSBudl9lbmNvZGVyOworCisJCQlicmVhazsKKwkJY2FzZSBEQ0JfT1VUUFVUX0xWRFM6 CisJCQkvKiBDYW4gd2UgYWN0dWFsbHkgcHJvYmUgdGhpcyBMVkRTIGRpc3BsYXk/ICovCisJCQlp ZiAoISgodmdhX3N3aXRjaGVyb29faGFuZGxlcl9mbGFncygpICYKKwkJCSAgICAgICBWR0FfU1dJ VENIRVJPT19DQU5fU1dJVENIX0REQykgJiYKKwkJCSAgICAgIG52X2VuY29kZXItPmkyYykpCisJ CQkJY29udGludWU7CisKIAkJCXZnYV9zd2l0Y2hlcm9vX2xvY2tfZGRjKGRldi0+cGRldik7Ci0J CQlyZXQgPSBudmttX3Byb2JlX2kyYyhudl9lbmNvZGVyLT5pMmMsIDB4NTApOwotCQkJdmdhX3N3 aXRjaGVyb29fdW5sb2NrX2RkYyhkZXYtPnBkZXYpOwotCQkJaWYgKHJldCkKLQkJCQlicmVhazsK LQkJfSBlbHNlCi0JCWlmIChudl9lbmNvZGVyLT5pMmMpIHsKIAkJCWlmIChudmttX3Byb2JlX2ky Yyhudl9lbmNvZGVyLT5pMmMsIDB4NTApKQotCQkJCWJyZWFrOworCQkJCWZvdW5kID0gbnZfZW5j b2RlcjsKKwkJCXZnYV9zd2l0Y2hlcm9vX3VubG9ja19kZGMoZGV2LT5wZGV2KTsKKworCQkJYnJl YWs7CisJCWRlZmF1bHQ6CisJCQlpZiAobnZfZW5jb2Rlci0+aTJjICYmCisJCQkgICAgbnZrbV9w cm9iZV9pMmMobnZfZW5jb2Rlci0+aTJjLCAweDUwKSkKKwkJCQlmb3VuZCA9IG52X2VuY29kZXI7 CisKKwkJCWJyZWFrOwogCQl9CisJCWlmIChmb3VuZCkKKwkJCWJyZWFrOwogCX0KIAogCS8qIGVE UCBwYW5lbCBub3QgZGV0ZWN0ZWQsIHJlc3RvcmUgcGFuZWwgcG93ZXIgR1BJTyB0byBwcmV2aW91 cwogCSAqIHN0YXRlIHRvIGF2b2lkIGNvbmZ1c2luZyB0aGUgU09SIGZvciBvdGhlciBvdXRwdXQg dHlwZXMuCiAJICovCi0JaWYgKCFudl9lbmNvZGVyICYmIHBhbmVsID09IDApCisJaWYgKCFmb3Vu ZCAmJiBwYW5lbCA9PSAwKQogCQludmttX2dwaW9fc2V0KGdwaW8sIDAsIERDQl9HUElPX1BBTkVM X1BPV0VSLCAweGZmLCBwYW5lbCk7CiAKLQlyZXR1cm4gbnZfZW5jb2RlcjsKKwlyZXR1cm4gZm91 bmQ7CiB9CiAKIHN0YXRpYyBzdHJ1Y3Qgbm91dmVhdV9lbmNvZGVyICoKLS0gCjIuMTcuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWls aW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==