From: Sean Paul Subject: [PATCH 10/13] drm/msm/dsi: Simplify the logic in msm_dsi_manager_panel_init() Date: Mon, 17 Jun 2019 16:12:55 -0400 Message-ID: <20190617201301.133275-7-sean@poorly.run> References: <20190617200405.131843-1-sean@poorly.run> <20190617201301.133275-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190617201301.133275-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Clark , Sean Paul , Daniel Vetter , Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpUaGlzIHBhdGNoIG1vdmVz IHRoaW5ncyBhcm91bmQgYSBiaXQgdG8gYmUgYSBsaXR0bGUgbW9yZSByZWFkYWJsZSBhbmQKcHVs bHMgb3V0IHRoZSBzZXRfZW5jb2Rlcl9tb2RlKCkgY2FsbCBpbnRvIGl0cyBvd24gZnVuY3Rpb24g Zm9yIGxhdGVyCnVzZS4KClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21p dW0ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vZHNpL2RzaV9tYW5hZ2VyLmMgfCAxMDAg KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1OSBpbnNlcnRpb25z KCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rz aS9kc2lfbWFuYWdlci5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kc2kvZHNpX21hbmFnZXIuYwpp bmRleCA4NTUxMzkxOTU3NjkuLjFlZTMxOTdhOWJkZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL21zbS9kc2kvZHNpX21hbmFnZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2RzaS9k c2lfbWFuYWdlci5jCkBAIC0yMzksNTYgKzIzOSw3MSBAQCBzdGF0aWMgYm9vbCBkc2lfbWdyX2lz X2NtZF9tb2RlKHN0cnVjdCBtc21fZHNpICptc21fZHNpKQogCXJldHVybiAhKGhvc3RfZmxhZ3Mg JiBNSVBJX0RTSV9NT0RFX1ZJREVPKTsKIH0KIAotc3RhdGljIHZvaWQgbXNtX2RzaV9tYW5hZ2Vy X3BhbmVsX2luaXQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgdTggaWQpCitzdGF0 aWMgdm9pZCBtc21fZHNpX21hbmFnZXJfc2V0dXBfZW5jb2RlcihpbnQgaWQpCiB7CiAJc3RydWN0 IG1zbV9kc2kgKm1zbV9kc2kgPSBkc2lfbWdyX2dldF9kc2koaWQpOwotCXN0cnVjdCBtc21fZHNp ICpvdGhlcl9kc2kgPSBkc2lfbWdyX2dldF9vdGhlcl9kc2koaWQpOwotCXN0cnVjdCBtc21fZHJt X3ByaXZhdGUgKnByaXYgPSBjb25uZWN0b3ItPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IG1z bV9kcm1fcHJpdmF0ZSAqcHJpdiA9IG1zbV9kc2ktPmRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0 IG1zbV9rbXMgKmttcyA9IHByaXYtPmttczsKLQlib29sIGNtZF9tb2RlOworCXN0cnVjdCBkcm1f ZW5jb2RlciAqZW5jb2RlciA9IG1zbV9kc2lfZ2V0X2VuY29kZXIobXNtX2RzaSk7CiAKLQlpZiAo IW1zbV9kc2ktPnBhbmVsKSB7Ci0JCW1zbV9kc2ktPnBhbmVsID0gbXNtX2RzaV9ob3N0X2dldF9w YW5lbChtc21fZHNpLT5ob3N0KTsKKwlpZiAoZW5jb2RlciAmJiBrbXMtPmZ1bmNzLT5zZXRfZW5j b2Rlcl9tb2RlKQorCQlrbXMtPmZ1bmNzLT5zZXRfZW5jb2Rlcl9tb2RlKGttcywgZW5jb2RlciwK KwkJCQkJICAgICBkc2lfbWdyX2lzX2NtZF9tb2RlKG1zbV9kc2kpKTsKK30KIAotCQkvKiBUaGVy ZSBpcyBvbmx5IDEgcGFuZWwgaW4gdGhlIGdsb2JhbCBwYW5lbCBsaXN0Ci0JCSAqIGZvciBkdWFs IERTSSBtb2RlLiBUaGVyZWZvcmUgc2xhdmUgZHNpIHNob3VsZCBnZXQKLQkJICogdGhlIGRybV9w YW5lbCBpbnN0YW5jZSBmcm9tIG1hc3RlciBkc2kuCi0JCSAqLwotCQlpZiAoIW1zbV9kc2ktPnBh bmVsICYmIElTX0RVQUxfRFNJKCkgJiYKLQkJCSFJU19NQVNURVJfRFNJX0xJTksoaWQpICYmIG90 aGVyX2RzaSkKLQkJCW1zbV9kc2ktPnBhbmVsID0gbXNtX2RzaV9ob3N0X2dldF9wYW5lbCgKLQkJ CQkJCW90aGVyX2RzaS0+aG9zdCk7CitzdGF0aWMgaW50IG1zbV9kc2lfbWFuYWdlcl9wYW5lbF9p bml0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uLCB1OCBpZCkKK3sKKwlzdHJ1Y3QgbXNtX2Ry bV9wcml2YXRlICpwcml2ID0gY29ubi0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgbXNtX2tt cyAqa21zID0gcHJpdi0+a21zOworCXN0cnVjdCBtc21fZHNpICptc21fZHNpID0gZHNpX21ncl9n ZXRfZHNpKGlkKTsKKwlzdHJ1Y3QgbXNtX2RzaSAqb3RoZXJfZHNpID0gZHNpX21ncl9nZXRfb3Ro ZXJfZHNpKGlkKTsKKwlzdHJ1Y3QgbXNtX2RzaSAqbWFzdGVyX2RzaSwgKnNsYXZlX2RzaTsKKwlz dHJ1Y3QgZHJtX3BhbmVsICpwYW5lbDsKIAorCWlmIChJU19EVUFMX0RTSSgpICYmICFJU19NQVNU RVJfRFNJX0xJTksoaWQpKSB7CisJCW1hc3Rlcl9kc2kgPSBvdGhlcl9kc2k7CisJCXNsYXZlX2Rz aSA9IG1zbV9kc2k7CisJfSBlbHNlIHsKKwkJbWFzdGVyX2RzaSA9IG1zbV9kc2k7CisJCXNsYXZl X2RzaSA9IG90aGVyX2RzaTsKKwl9CiAKLQkJY21kX21vZGUgPSBkc2lfbWdyX2lzX2NtZF9tb2Rl KG1zbV9kc2kpOwotCQlpZiAobXNtX2RzaS0+cGFuZWwgJiYga21zLT5mdW5jcy0+c2V0X2VuY29k ZXJfbW9kZSkgewotCQkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0KLQkJCQkJbXNtX2Rz aV9nZXRfZW5jb2Rlcihtc21fZHNpKTsKKwkvKgorCSAqIFRoZXJlIGlzIG9ubHkgMSBwYW5lbCBp biB0aGUgZ2xvYmFsIHBhbmVsIGxpc3QgZm9yIGR1YWwgRFNJIG1vZGUuCisJICogVGhlcmVmb3Jl IHNsYXZlIGRzaSBzaG91bGQgZ2V0IHRoZSBkcm1fcGFuZWwgaW5zdGFuY2UgZnJvbSBtYXN0ZXIK KwkgKiBkc2kuCisJICovCisJcGFuZWwgPSBtc21fZHNpX2hvc3RfZ2V0X3BhbmVsKG1hc3Rlcl9k c2ktPmhvc3QpOworCWlmIChJU19FUlIocGFuZWwpKSB7CisJCURSTV9FUlJPUigiQ291bGQgbm90 IGZpbmQgcGFuZWwgZm9yICV1ICglbGQpXG4iLCBtc21fZHNpLT5pZCwKKwkJCSAgUFRSX0VSUihw YW5lbCkpOworCQlyZXR1cm4gUFRSX0VSUihwYW5lbCk7CisJfQogCi0JCQlrbXMtPmZ1bmNzLT5z ZXRfZW5jb2Rlcl9tb2RlKGttcywgZW5jb2RlciwgY21kX21vZGUpOwotCQl9CisJaWYgKCFwYW5l bCkKKwkJcmV0dXJuIDA7CiAKLQkJaWYgKG1zbV9kc2ktPnBhbmVsICYmIElTX0RVQUxfRFNJKCkp Ci0JCQlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmY29ubmVjdG9yLT5iYXNlLAotCQkJCWNv bm5lY3Rvci0+ZGV2LT5tb2RlX2NvbmZpZy50aWxlX3Byb3BlcnR5LCAwKTsKKwltc21fZHNpX21h bmFnZXJfc2V0dXBfZW5jb2RlcihpZCk7CiAKLQkJLyogU2V0IHNwbGl0IGRpc3BsYXkgaW5mbyB0 byBrbXMgb25jZSBkdWFsIERTSSBwYW5lbCBpcwotCQkgKiBjb25uZWN0ZWQgdG8gYm90aCBob3N0 cy4KLQkJICovCi0JCWlmIChtc21fZHNpLT5wYW5lbCAmJiBJU19EVUFMX0RTSSgpICYmCi0JCQlv dGhlcl9kc2kgJiYgb3RoZXJfZHNpLT5wYW5lbCkgewotCQkJc3RydWN0IGRybV9lbmNvZGVyICpl bmNvZGVyID0gbXNtX2RzaV9nZXRfZW5jb2RlcigKLQkJCQkJZHNpX21ncl9nZXRfZHNpKERTSV9F TkNPREVSX01BU1RFUikpOwotCQkJc3RydWN0IGRybV9lbmNvZGVyICpzbGF2ZV9lbmMgPSBtc21f ZHNpX2dldF9lbmNvZGVyKAotCQkJCQlkc2lfbWdyX2dldF9kc2koRFNJX0VOQ09ERVJfU0xBVkUp KTsKLQotCQkJaWYgKGttcy0+ZnVuY3MtPnNldF9zcGxpdF9kaXNwbGF5KQotCQkJCWttcy0+ZnVu Y3MtPnNldF9zcGxpdF9kaXNwbGF5KGttcywgZW5jb2RlciwKLQkJCQkJCQlzbGF2ZV9lbmMsIGNt ZF9tb2RlKTsKLQkJCWVsc2UKLQkJCQlwcl9lcnIoIm1kcCBkb2VzIG5vdCBzdXBwb3J0IGR1YWwg RFNJXG4iKTsKLQkJfQorCWlmICghSVNfRFVBTF9EU0koKSkKKwkJZ290byBvdXQ7CisKKwlkcm1f b2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmY29ubi0+YmFzZSwKKwkJCQkgICBjb25uLT5kZXYtPm1v ZGVfY29uZmlnLnRpbGVfcHJvcGVydHksIDApOworCisJLyoKKwkgKiBTZXQgc3BsaXQgZGlzcGxh eSBpbmZvIHRvIGttcyBvbmNlIGR1YWwgRFNJIHBhbmVsIGlzIGNvbm5lY3RlZCB0bworCSAqIGJv dGggaG9zdHMuCisJICovCisJaWYgKG90aGVyX2RzaSAmJiBvdGhlcl9kc2ktPnBhbmVsICYmIGtt cy0+ZnVuY3MtPnNldF9zcGxpdF9kaXNwbGF5KSB7CisJCWttcy0+ZnVuY3MtPnNldF9zcGxpdF9k aXNwbGF5KGttcywgbWFzdGVyX2RzaS0+ZW5jb2RlciwKKwkJCQkJICAgICAgc2xhdmVfZHNpLT5l bmNvZGVyLAorCQkJCQkgICAgICBkc2lfbWdyX2lzX2NtZF9tb2RlKG1zbV9kc2kpKTsKIAl9CisK K291dDoKKwltc21fZHNpLT5wYW5lbCA9IHBhbmVsOworCXJldHVybiAwOwogfQogCiBzdGF0aWMg ZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cyBkc2lfbWdyX2Nvbm5lY3Rvcl9kZXRlY3QoCkBAIC0y OTgsOCArMzEzLDExIEBAIHN0YXRpYyBlbnVtIGRybV9jb25uZWN0b3Jfc3RhdHVzIGRzaV9tZ3Jf Y29ubmVjdG9yX2RldGVjdCgKIAlzdHJ1Y3QgbXNtX2RzaSAqbXNtX2RzaSA9IGRzaV9tZ3JfZ2V0 X2RzaShpZCk7CiAKIAlEQkcoImlkPSVkIiwgaWQpOwotCWlmICghbXNtX2RzaS0+cGFuZWwpCi0J CW1zbV9kc2lfbWFuYWdlcl9wYW5lbF9pbml0KGNvbm5lY3RvciwgaWQpOworCWlmICghbXNtX2Rz aS0+cGFuZWwpIHsKKwkJaW50IHJldCA9IG1zbV9kc2lfbWFuYWdlcl9wYW5lbF9pbml0KGNvbm5l Y3RvciwgaWQpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIGNvbm5lY3Rvcl9zdGF0dXNfZGlzY29u bmVjdGVkOworCX0KIAogCXJldHVybiBtc21fZHNpLT5wYW5lbCA/IGNvbm5lY3Rvcl9zdGF0dXNf Y29ubmVjdGVkIDoKIAkJY29ubmVjdG9yX3N0YXR1c19kaXNjb25uZWN0ZWQ7Ci0tIApTZWFuIFBh dWwsIFNvZnR3YXJlIEVuZ2luZWVyLCBHb29nbGUgLyBDaHJvbWl1bSBPUwoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlz dApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5v