From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: [PATCH 2/6] drm/nouveau: Use drm_dp_get_payload_info() for getting payload/vcpi Date: Fri, 16 Nov 2018 19:21:16 -0500 Message-ID: <20181117002120.28703-3-lyude@redhat.com> References: <20181117002120.28703-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181117002120.28703-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: intel-gfx@lists.freedesktop.org Q3VycmVudGx5LCBub3V2ZWF1IHRyaWVzIHRvIGdvIHRocm91Z2ggdGhlIGRybV9kcF9tc3RfcG9y dCBzdHJ1Y3R1cmVzCml0c2VsZiBpbiBvcmRlciB0byByZXRyaWV2ZSB0aGUgcmVsZXZhbnQgcGF5 bG9hZCBhbmQgVkNQSSBpbmZvcm1hdGlvbgp0aGF0IGl0IG5lZWRzIHRvIHJlcG9ydCB0byB0aGUg R1BVLiBUaGlzIGlzIHdyb25nOiBtc3RjLT5wb3J0IGNvdWxkIGJlCmRlc3Ryb3llZCBhdCBhbnkg cG9pbnQsIGFuZCBhZGRpdGlvbmFsbHkgdGhlIHBheWxvYWQgY291bGQgYmUgY2hhbmdlZCBhdAph bnkgcG9pbnQgYmVjYXVzZSBpdCBkb2Vzbid0IGJvdGhlciB0cnlpbmcgdG8gZ3JhYiB0aGUgcGF5 bG9hZCBsb2NrLiBTbzsKcmVtb3ZlIG52NTBfbXN0b19wYXlsb2FkIGVudGlyZWx5IGFuZCB1c2Ug dGhlIG5ldwpkcm1fZHBfZ2V0X3BheWxvYWRfaW5mbygpIGhlbHBlci4KClNpZ25lZC1vZmYtYnk6 IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL25vdXZl YXUvZGlzcG52NTAvZGlzcC5jIHwgNTUgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYwppbmRleCA2Y2JiYWUzZjQzOGIuLmU2ZjcyY2EwYjFm YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYwpAQCAtNjY1LDQxICs2 NjUsMjQgQEAgc3RydWN0IG52NTBfbXN0byB7CiAJYm9vbCBkaXNhYmxlZDsKIH07CiAKLXN0YXRp YyBzdHJ1Y3QgZHJtX2RwX3BheWxvYWQgKgotbnY1MF9tc3RvX3BheWxvYWQoc3RydWN0IG52NTBf bXN0byAqbXN0bykKLXsKLQlzdHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSA9IG5vdXZlYXVfZHJtKG1z dG8tPmVuY29kZXIuZGV2KTsKLQlzdHJ1Y3QgbnY1MF9tc3RjICptc3RjID0gbXN0by0+bXN0YzsK LQlzdHJ1Y3QgbnY1MF9tc3RtICptc3RtID0gbXN0Yy0+bXN0bTsKLQlpbnQgdmNwaSA9IG1zdGMt PnBvcnQtPnZjcGkudmNwaSwgaTsKLQotCU5WX0FUT01JQyhkcm0sICIlczogdmNwaSAlZFxuIiwg bXN0by0+ZW5jb2Rlci5uYW1lLCB2Y3BpKTsKLQlmb3IgKGkgPSAwOyBpIDwgbXN0bS0+bWdyLm1h eF9wYXlsb2FkczsgaSsrKSB7Ci0JCXN0cnVjdCBkcm1fZHBfcGF5bG9hZCAqcGF5bG9hZCA9ICZt c3RtLT5tZ3IucGF5bG9hZHNbaV07Ci0JCU5WX0FUT01JQyhkcm0sICIlczogJWQ6IHZjcGkgJWQg c3RhcnQgMHglMDJ4IHNsb3RzIDB4JTAyeFxuIiwKLQkJCSAgbXN0bS0+b3V0cC0+YmFzZS5iYXNl Lm5hbWUsIGksIHBheWxvYWQtPnZjcGksCi0JCQkgIHBheWxvYWQtPnN0YXJ0X3Nsb3QsIHBheWxv YWQtPm51bV9zbG90cyk7Ci0JfQotCi0JZm9yIChpID0gMDsgaSA8IG1zdG0tPm1nci5tYXhfcGF5 bG9hZHM7IGkrKykgewotCQlzdHJ1Y3QgZHJtX2RwX3BheWxvYWQgKnBheWxvYWQgPSAmbXN0bS0+ bWdyLnBheWxvYWRzW2ldOwotCQlpZiAocGF5bG9hZC0+dmNwaSA9PSB2Y3BpKQotCQkJcmV0dXJu IHBheWxvYWQ7Ci0JfQotCi0JcmV0dXJuIE5VTEw7Ci19Ci0KIHN0YXRpYyB2b2lkCiBudjUwX21z dG9fY2xlYW51cChzdHJ1Y3QgbnY1MF9tc3RvICptc3RvKQogewogCXN0cnVjdCBub3V2ZWF1X2Ry bSAqZHJtID0gbm91dmVhdV9kcm0obXN0by0+ZW5jb2Rlci5kZXYpOwogCXN0cnVjdCBudjUwX21z dGMgKm1zdGMgPSBtc3RvLT5tc3RjOwogCXN0cnVjdCBudjUwX21zdG0gKm1zdG0gPSBtc3RjLT5t c3RtOworCXN0cnVjdCBkcm1fZHBfcGF5bG9hZCBwYXlsb2FkOworCXN0cnVjdCBkcm1fZHBfdmNw aSB2Y3BpOworCWludCByZXQ7CiAKIAlOVl9BVE9NSUMoZHJtLCAiJXM6IG1zdG8gY2xlYW51cFxu IiwgbXN0by0+ZW5jb2Rlci5uYW1lKTsKLQlpZiAobXN0Yy0+cG9ydCAmJiBtc3RjLT5wb3J0LT52 Y3BpLnZjcGkgPiAwICYmICFudjUwX21zdG9fcGF5bG9hZChtc3RvKSkKLQkJZHJtX2RwX21zdF9k ZWFsbG9jYXRlX3ZjcGkoJm1zdG0tPm1nciwgbXN0Yy0+cG9ydCk7CisJaWYgKG1zdGMtPnBvcnQp IHsKKwkJcmV0ID0gZHJtX2RwX2dldF9wYXlsb2FkX2luZm8oJm1zdG0tPm1nciwgbXN0Yy0+cG9y dCwKKwkJCQkJICAgICAgJnZjcGksICZwYXlsb2FkKTsKKwkJaWYgKCFyZXQpCisJCQlkcm1fZHBf bXN0X2RlYWxsb2NhdGVfdmNwaSgmbXN0bS0+bWdyLCBtc3RjLT5wb3J0KTsKKwl9CisKIAlpZiAo bXN0by0+ZGlzYWJsZWQpIHsKIAkJbXN0by0+bXN0YyA9IE5VTEw7CiAJCW1zdG8tPmhlYWQgPSBO VUxMOwpAQCAtNzEzLDYgKzY5Niw5IEBAIG52NTBfbXN0b19wcmVwYXJlKHN0cnVjdCBudjUwX21z dG8gKm1zdG8pCiAJc3RydWN0IG5vdXZlYXVfZHJtICpkcm0gPSBub3V2ZWF1X2RybShtc3RvLT5l bmNvZGVyLmRldik7CiAJc3RydWN0IG52NTBfbXN0YyAqbXN0YyA9IG1zdG8tPm1zdGM7CiAJc3Ry dWN0IG52NTBfbXN0bSAqbXN0bSA9IG1zdGMtPm1zdG07CisJc3RydWN0IGRybV9kcF9wYXlsb2Fk IHBheWxvYWQ7CisJc3RydWN0IGRybV9kcF92Y3BpIHZjcGk7CisJaW50IHJldDsKIAlzdHJ1Y3Qg ewogCQlzdHJ1Y3QgbnY1MF9kaXNwX210aGRfdjEgYmFzZTsKIAkJc3RydWN0IG52NTBfZGlzcF9z b3JfZHBfbXN0X3ZjcGlfdjAgdmNwaTsKQEAgLTcyNSwxMyArNzExLDE0IEBAIG52NTBfbXN0b19w cmVwYXJlKHN0cnVjdCBudjUwX21zdG8gKm1zdG8pCiAJfTsKIAogCU5WX0FUT01JQyhkcm0sICIl czogbXN0byBwcmVwYXJlXG4iLCBtc3RvLT5lbmNvZGVyLm5hbWUpOwotCWlmIChtc3RjLT5wb3J0 ICYmIG1zdGMtPnBvcnQtPnZjcGkudmNwaSA+IDApIHsKLQkJc3RydWN0IGRybV9kcF9wYXlsb2Fk ICpwYXlsb2FkID0gbnY1MF9tc3RvX3BheWxvYWQobXN0byk7Ci0JCWlmIChwYXlsb2FkKSB7Ci0J CQlhcmdzLnZjcGkuc3RhcnRfc2xvdCA9IHBheWxvYWQtPnN0YXJ0X3Nsb3Q7Ci0JCQlhcmdzLnZj cGkubnVtX3Nsb3RzID0gcGF5bG9hZC0+bnVtX3Nsb3RzOwotCQkJYXJncy52Y3BpLnBibiA9IG1z dGMtPnBvcnQtPnZjcGkucGJuOwotCQkJYXJncy52Y3BpLmFsaWduZWRfcGJuID0gbXN0Yy0+cG9y dC0+dmNwaS5hbGlnbmVkX3BibjsKKwlpZiAobXN0Yy0+cG9ydCkgeworCQlyZXQgPSBkcm1fZHBf Z2V0X3BheWxvYWRfaW5mbygmbXN0bS0+bWdyLCBtc3RjLT5wb3J0LAorCQkJCQkgICAgICAmdmNw aSwgJnBheWxvYWQpOworCQlpZiAoIXJldCkgeworCQkJYXJncy52Y3BpLnN0YXJ0X3Nsb3QgPSBw YXlsb2FkLnN0YXJ0X3Nsb3Q7CisJCQlhcmdzLnZjcGkubnVtX3Nsb3RzID0gcGF5bG9hZC5udW1f c2xvdHM7CisJCQlhcmdzLnZjcGkucGJuID0gdmNwaS5wYm47CisJCQlhcmdzLnZjcGkuYWxpZ25l ZF9wYm4gPSB2Y3BpLmFsaWduZWRfcGJuOwogCQl9CiAJfQogCi0tIAoyLjE5LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBs aXN0Ck5vdXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vbm91dmVhdQo=