From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 13/15] drm/msm: edp: Avoid drm_dp_link helpers Date: Tue, 15 Oct 2019 16:35:07 +0200 Message-ID: <20191015143509.1104985-14-thierry.reding@gmail.com> References: <20191015143509.1104985-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE46C6E82E for ; Tue, 15 Oct 2019 14:35:46 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id r5so24126836wrm.12 for ; Tue, 15 Oct 2019 07:35:46 -0700 (PDT) In-Reply-To: <20191015143509.1104985-1-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkR1cmluZyB0aGUgZGlz Y3Vzc2lvbiBvZiBwYXRjaGVzIHRoYXQgZW5oYW5jZSB0aGUgZHJtX2RwX2xpbmsgaGVscGVycyBp dAp3YXMgY29uY2x1ZGVkIHRoYXQgdGhlc2UgaGVscGVycyBhcmVuJ3QgdmVyeSB1c2VmdWwgdG8g YmVnaW4gd2l0aC4gU3RhcnQKcHVzaGluZyB0aGUgZXF1aXZhbGVudCBjb2RlIGludG8gaW5kaXZp ZHVhbCBkcml2ZXJzIHRvIHVsdGltYXRlbHkgcmVtb3ZlCnRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBU aGllcnJ5IFJlZGluZyA8dHJlZGluZ0BudmlkaWEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9t c20vZWRwL2VkcF9jdHJsLmMgfCA3MCArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2VkcC9lZHBfY3RybC5jIGIvZHJpdmVycy9ncHUvZHJt L21zbS9lZHAvZWRwX2N0cmwuYwppbmRleCA3ZjNkZDNmZmUyYzkuLjBkOTY1N2NjNzBkYiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9lZHAvZWRwX2N0cmwuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL2VkcC9lZHBfY3RybC5jCkBAIC04OSw3ICs4OSw2IEBAIHN0cnVjdCBlZHBf Y3RybCB7CiAJLyogZWRpZCByYXcgZGF0YSAqLwogCXN0cnVjdCBlZGlkICplZGlkOwogCi0Jc3Ry dWN0IGRybV9kcF9saW5rIGRwX2xpbms7CiAJc3RydWN0IGRybV9kcF9hdXggKmRybV9hdXg7CiAK IAkvKiBkcGNkIHJhdyBkYXRhICovCkBAIC00MDMsNyArNDAyLDcgQEAgc3RhdGljIHZvaWQgZWRw X2ZpbGxfbGlua19jZmcoc3RydWN0IGVkcF9jdHJsICpjdHJsKQogCXUzMiBwcmF0ZTsKIAl1MzIg bHJhdGU7CiAJdTMyIGJwcDsKLQl1OCBtYXhfbGFuZSA9IGN0cmwtPmRwX2xpbmsubnVtX2xhbmVz OworCXU4IG1heF9sYW5lID0gZHJtX2RwX21heF9sYW5lX2NvdW50KGN0cmwtPmRwY2QpOwogCXU4 IGxhbmU7CiAKIAlwcmF0ZSA9IGN0cmwtPnBpeGVsX3JhdGU7CkBAIC00MTMsNyArNDEyLDcgQEAg c3RhdGljIHZvaWQgZWRwX2ZpbGxfbGlua19jZmcoc3RydWN0IGVkcF9jdHJsICpjdHJsKQogCSAq IEJ5IGRlZmF1bHQsIHVzZSB0aGUgbWF4aW11bSBsaW5rIHJhdGUgYW5kIG1pbmltdW0gbGFuZSBj b3VudCwKIAkgKiBzbyB0aGF0IHdlIGNhbiBkbyByYXRlIGRvd24gc2hpZnQgZHVyaW5nIGxpbmsg dHJhaW5pbmcuCiAJICovCi0JY3RybC0+bGlua19yYXRlID0gZHJtX2RwX2xpbmtfcmF0ZV90b19i d19jb2RlKGN0cmwtPmRwX2xpbmsucmF0ZSk7CisJY3RybC0+bGlua19yYXRlID0gY3RybC0+ZHBj ZFtEUF9NQVhfTElOS19SQVRFXTsKIAogCXByYXRlICo9IGJwcDsKIAlwcmF0ZSAvPSA4OyAvKiBp biBrQnl0ZSAqLwpAQCAtNDM5LDcgKzQzOCw3IEBAIHN0YXRpYyB2b2lkIGVkcF9jb25maWdfY3Ry bChzdHJ1Y3QgZWRwX2N0cmwgKmN0cmwpCiAKIAlkYXRhID0gRURQX0NPTkZJR1VSQVRJT05fQ1RS TF9MQU5FUyhjdHJsLT5sYW5lX2NudCAtIDEpOwogCi0JaWYgKGN0cmwtPmRwX2xpbmsuY2FwYWJp bGl0aWVzICYgRFBfTElOS19DQVBfRU5IQU5DRURfRlJBTUlORykKKwlpZiAoZHJtX2RwX2VuaGFu Y2VkX2ZyYW1lX2NhcChjdHJsLT5kcGNkKSkKIAkJZGF0YSB8PSBFRFBfQ09ORklHVVJBVElPTl9D VFJMX0VOSEFOQ0VEX0ZSQU1JTkc7CiAKIAlkZXB0aCA9IEVEUF82QklUOwpAQCAtNzAxLDcgKzcw MCw3IEBAIHN0YXRpYyBpbnQgZWRwX2xpbmtfcmF0ZV9kb3duX3NoaWZ0KHN0cnVjdCBlZHBfY3Ry bCAqY3RybCkKIAogCXJhdGUgPSBjdHJsLT5saW5rX3JhdGU7CiAJbGFuZSA9IGN0cmwtPmxhbmVf Y250OwotCW1heF9sYW5lID0gY3RybC0+ZHBfbGluay5udW1fbGFuZXM7CisJbWF4X2xhbmUgPSBk cm1fZHBfbWF4X2xhbmVfY291bnQoY3RybC0+ZHBjZCk7CiAKIAlicHAgPSBjdHJsLT5jb2xvcl9k ZXB0aCAqIDM7CiAJcHJhdGUgPSBjdHJsLT5waXhlbF9yYXRlOwpAQCAtNzUxLDE4ICs3NTAsMjIg QEAgc3RhdGljIGludCBlZHBfY2xlYXJfdHJhaW5pbmdfcGF0dGVybihzdHJ1Y3QgZWRwX2N0cmwg KmN0cmwpCiAKIHN0YXRpYyBpbnQgZWRwX2RvX2xpbmtfdHJhaW4oc3RydWN0IGVkcF9jdHJsICpj dHJsKQogeworCXU4IHZhbHVlc1syXTsKIAlpbnQgcmV0OwotCXN0cnVjdCBkcm1fZHBfbGluayBk cF9saW5rOwogCiAJREJHKCIiKTsKIAkvKgogCSAqIFNldCB0aGUgY3VycmVudCBsaW5rIHJhdGUg YW5kIGxhbmUgY250IHRvIHBhbmVsLiBUaGV5IG1heSBoYXZlIGJlZW4KIAkgKiBhZGp1c3RlZCBh bmQgdGhlIHZhbHVlcyBhcmUgZGlmZmVyZW50IGZyb20gdGhlbSBpbiBEUENEIENBUAogCSAqLwot CWRwX2xpbmsubnVtX2xhbmVzID0gY3RybC0+bGFuZV9jbnQ7Ci0JZHBfbGluay5yYXRlID0gZHJt X2RwX2J3X2NvZGVfdG9fbGlua19yYXRlKGN0cmwtPmxpbmtfcmF0ZSk7Ci0JZHBfbGluay5jYXBh YmlsaXRpZXMgPSBjdHJsLT5kcF9saW5rLmNhcGFiaWxpdGllczsKLQlpZiAoZHJtX2RwX2xpbmtf Y29uZmlndXJlKGN0cmwtPmRybV9hdXgsICZkcF9saW5rKSA8IDApCisJdmFsdWVzWzBdID0gY3Ry bC0+bGFuZV9jbnQ7CisJdmFsdWVzWzFdID0gY3RybC0+bGlua19yYXRlOworCisJaWYgKGRybV9k cF9lbmhhbmNlZF9mcmFtZV9jYXAoY3RybC0+ZHBjZCkpCisJCXZhbHVlc1sxXSB8PSBEUF9MQU5F X0NPVU5UX0VOSEFOQ0VEX0ZSQU1FX0VOOworCisJaWYgKGRybV9kcF9kcGNkX3dyaXRlKGN0cmwt PmRybV9hdXgsIERQX0xJTktfQldfU0VULCB2YWx1ZXMsCisJCQkgICAgICBzaXplb2YodmFsdWVz KSkgPCAwKQogCQlyZXR1cm4gRURQX1RSQUlOX0ZBSUw7CiAKIAljdHJsLT52X2xldmVsID0gMDsg Lyogc3RhcnQgZnJvbSBkZWZhdWx0IGxldmVsICovCkBAIC05NTIsNiArOTU1LDcgQEAgc3RhdGlj IHZvaWQgZWRwX2N0cmxfb25fd29ya2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIHsKIAlz dHJ1Y3QgZWRwX2N0cmwgKmN0cmwgPSBjb250YWluZXJfb2YoCiAJCQkJd29yaywgc3RydWN0IGVk cF9jdHJsLCBvbl93b3JrKTsKKwl1OCB2YWx1ZTsKIAlpbnQgcmV0OwogCiAJbXV0ZXhfbG9jaygm Y3RybC0+ZGV2X211dGV4KTsKQEAgLTk2NSw5ICs5NjksMjcgQEAgc3RhdGljIHZvaWQgZWRwX2N0 cmxfb25fd29ya2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAllZHBfY3RybF9saW5rX2Vu YWJsZShjdHJsLCAxKTsKIAogCWVkcF9jdHJsX2lycV9lbmFibGUoY3RybCwgMSk7Ci0JcmV0ID0g ZHJtX2RwX2xpbmtfcG93ZXJfdXAoY3RybC0+ZHJtX2F1eCwgJmN0cmwtPmRwX2xpbmspOwotCWlm IChyZXQpCi0JCWdvdG8gZmFpbDsKKworCS8qIERQX1NFVF9QT1dFUiByZWdpc3RlciBpcyBvbmx5 IGF2YWlsYWJsZSBvbiBEUENEIHYxLjEgYW5kIGxhdGVyICovCisJaWYgKGN0cmwtPmRwY2RbRFBf RFBDRF9SRVZdID49IDB4MTEpIHsKKwkJcmV0ID0gZHJtX2RwX2RwY2RfcmVhZGIoY3RybC0+ZHJt X2F1eCwgRFBfU0VUX1BPV0VSLCAmdmFsdWUpOworCQlpZiAocmV0IDwgMCkKKwkJCWdvdG8gZmFp bDsKKworCQl2YWx1ZSAmPSB+RFBfU0VUX1BPV0VSX01BU0s7CisJCXZhbHVlIHw9IERQX1NFVF9Q T1dFUl9EMDsKKworCQlyZXQgPSBkcm1fZHBfZHBjZF93cml0ZWIoY3RybC0+ZHJtX2F1eCwgRFBf U0VUX1BPV0VSLCB2YWx1ZSk7CisJCWlmIChyZXQgPCAwKQorCQkJZ290byBmYWlsOworCisJCS8q CisJCSAqIEFjY29yZGluZyB0byB0aGUgRFAgMS4xIHNwZWNpZmljYXRpb24sIGEgIlNpbmsgRGV2 aWNlIG11c3QKKwkJICogZXhpdCB0aGUgcG93ZXIgc2F2aW5nIHN0YXRlIHdpdGhpbiAxIG1zIiAo U2VjdGlvbiAyLjUuMy4xLAorCQkgKiBUYWJsZSA1LTUyLCAiU2luayBDb250cm9sIEZpZWxkIiAo cmVnaXN0ZXIgMHg2MDApLgorCQkgKi8KKwkJdXNsZWVwX3JhbmdlKDEwMDAsIDIwMDApOworCX0K IAogCWN0cmwtPnBvd2VyX29uID0gdHJ1ZTsKIApAQCAtMTAxMSw3ICsxMDMzLDE5IEBAIHN0YXRp YyB2b2lkIGVkcF9jdHJsX29mZl93b3JrZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCiAJ ZWRwX3N0YXRlX2N0cmwoY3RybCwgMCk7CiAKLQlkcm1fZHBfbGlua19wb3dlcl9kb3duKGN0cmwt PmRybV9hdXgsICZjdHJsLT5kcF9saW5rKTsKKwkvKiBEUF9TRVRfUE9XRVIgcmVnaXN0ZXIgaXMg b25seSBhdmFpbGFibGUgb24gRFBDRCB2MS4xIGFuZCBsYXRlciAqLworCWlmIChjdHJsLT5kcGNk W0RQX0RQQ0RfUkVWXSA+PSAweDExKSB7CisJCXU4IHZhbHVlOworCQlpbnQgcmV0OworCisJCXJl dCA9IGRybV9kcF9kcGNkX3JlYWRiKGN0cmwtPmRybV9hdXgsIERQX1NFVF9QT1dFUiwgJnZhbHVl KTsKKwkJaWYgKHJldCA+IDApIHsKKwkJCXZhbHVlICY9IH5EUF9TRVRfUE9XRVJfTUFTSzsKKwkJ CXZhbHVlIHw9IERQX1NFVF9QT1dFUl9EMzsKKworCQkJZHJtX2RwX2RwY2Rfd3JpdGViKGN0cmwt PmRybV9hdXgsIERQX1NFVF9QT1dFUiwgdmFsdWUpOworCQl9CisJfQogCiAJZWRwX2N0cmxfaXJx X2VuYWJsZShjdHJsLCAwKTsKIApAQCAtMTIyNSwxNCArMTI1OSw4IEBAIGludCBtc21fZWRwX2N0 cmxfZ2V0X3BhbmVsX2luZm8oc3RydWN0IGVkcF9jdHJsICpjdHJsLAogCQllZHBfY3RybF9pcnFf ZW5hYmxlKGN0cmwsIDEpOwogCX0KIAotCXJldCA9IGRybV9kcF9saW5rX3Byb2JlKGN0cmwtPmRy bV9hdXgsICZjdHJsLT5kcF9saW5rKTsKLQlpZiAocmV0KSB7Ci0JCXByX2VycigiJXM6IHJlYWQg ZHBjZCBjYXAgZmFpbGVkLCAlZFxuIiwgX19mdW5jX18sIHJldCk7Ci0JCWdvdG8gZGlzYWJsZV9y ZXQ7Ci0JfQotCiAJLyogSW5pdGlhbGl6ZSBsaW5rIHJhdGUgYXMgcGFuZWwgbWF4IGxpbmsgcmF0 ZSAqLwotCWN0cmwtPmxpbmtfcmF0ZSA9IGRybV9kcF9saW5rX3JhdGVfdG9fYndfY29kZShjdHJs LT5kcF9saW5rLnJhdGUpOworCWN0cmwtPmxpbmtfcmF0ZSA9IGN0cmwtPmRwY2RbRFBfTUFYX0xJ TktfUkFURV07CiAKIAljdHJsLT5lZGlkID0gZHJtX2dldF9lZGlkKGNvbm5lY3RvciwgJmN0cmwt PmRybV9hdXgtPmRkYyk7CiAJaWYgKCFjdHJsLT5lZGlkKSB7Ci0tIAoyLjIzLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==