From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH 2/3] drm/msm: dpu: Stop using encoder->crtc pointer Date: Mon, 12 Nov 2018 16:47:04 -0500 Message-ID: <20181112214713.69826-2-sean@poorly.run> References: <20181112214713.69826-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181112214713.69826-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, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Sean Paul , jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpJdCdzIGZvciBsZWdhY3kg ZHJpdmVycywgZm9yIGF0b21pYyBkcml2ZXJzIGNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2sKc2hv dWxkIGJlIHVzZWQgdG8gbWFwIGVuY29kZXIgdG8gY3J0Yy4KClNpZ25lZC1vZmYtYnk6IFNlYW4g UGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vZGlz cC9kcHUxL2RwdV9jcnRjLmMgfCA0NiArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9rbXMuYyAgfCAxOSArKysrKysrLS0tCiAyIGZpbGVz IGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9k cm0vbXNtL2Rpc3AvZHB1MS9kcHVfY3J0Yy5jCmluZGV4IDZlNjM2ZjM3Mzk1MC4uYmY1NDFhOTQy ZGE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfY3J0Yy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9jcnRjLmMKQEAgLTI4Nyw5 ICsyODcsOSBAQCBlbnVtIGRwdV9pbnRmX21vZGUgZHB1X2NydGNfZ2V0X2ludGZfbW9kZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAJCXJldHVybiBJTlRGX01PREVfTk9ORTsKIAl9CiAKLQlkcm1f Zm9yX2VhY2hfZW5jb2RlcihlbmNvZGVyLCBjcnRjLT5kZXYpCi0JCWlmIChlbmNvZGVyLT5jcnRj ID09IGNydGMpCi0JCQlyZXR1cm4gZHB1X2VuY29kZXJfZ2V0X2ludGZfbW9kZShlbmNvZGVyKTsK KwkvKiBUT0RPOiBSZXR1cm5zIHRoZSBmaXJzdCBJTlRGX01PREUsIGNvdWxkIHRoZXJlIGJlIG11 bHRpcGxlIHZhbHVlcz8gKi8KKwlkcm1fZm9yX2VhY2hfZW5jb2Rlcl9tYXNrKGVuY29kZXIsIGNy dGMtPmRldiwgY3J0Yy0+c3RhdGUtPmVuY29kZXJfbWFzaykKKwkJcmV0dXJuIGRwdV9lbmNvZGVy X2dldF9pbnRmX21vZGUoZW5jb2Rlcik7CiAKIAlyZXR1cm4gSU5URl9NT0RFX05PTkU7CiB9CkBA IC01NTQsMTMgKzU1NCw5IEBAIHN0YXRpYyB2b2lkIGRwdV9jcnRjX2F0b21pY19iZWdpbihzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldi0+ZXZlbnRf bG9jaywgZmxhZ3MpOwogCX0KIAotCWxpc3RfZm9yX2VhY2hfZW50cnkoZW5jb2RlciwgJmRldi0+ bW9kZV9jb25maWcuZW5jb2Rlcl9saXN0LCBoZWFkKSB7Ci0JCWlmIChlbmNvZGVyLT5jcnRjICE9 IGNydGMpCi0JCQljb250aW51ZTsKLQotCQkvKiBlbmNvZGVyIHdpbGwgdHJpZ2dlciBwZW5kaW5n IG1hc2sgbm93ICovCisJLyogZW5jb2RlciB3aWxsIHRyaWdnZXIgcGVuZGluZyBtYXNrIG5vdyAq LworCWRybV9mb3JfZWFjaF9lbmNvZGVyX21hc2soZW5jb2RlciwgY3J0Yy0+ZGV2LCBjcnRjLT5z dGF0ZS0+ZW5jb2Rlcl9tYXNrKQogCQlkcHVfZW5jb2Rlcl90cmlnZ2VyX2tpY2tvZmZfcGVuZGlu ZyhlbmNvZGVyKTsKLQl9CiAKIAkvKgogCSAqIElmIG5vIG1peGVycyBoYXZlIGJlZW4gYWxsb2Nh dGVkIGluIGRwdV9jcnRjX2F0b21pY19jaGVjaygpLApAQCAtNzA3LDcgKzcwMyw2IEBAIHN0YXRp YyBpbnQgX2RwdV9jcnRjX3dhaXRfZm9yX2ZyYW1lX2RvbmUoc3RydWN0IGRybV9jcnRjICpjcnRj KQogdm9pZCBkcHVfY3J0Y19jb21taXRfa2lja29mZihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7 CiAJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5kZXY7CiAJc3RydWN0IGRwdV9jcnRjICpkcHVfY3J0YyA9IHRvX2RwdV9jcnRjKGNy dGMpOwogCXN0cnVjdCBkcHVfa21zICpkcHVfa21zID0gX2RwdV9jcnRjX2dldF9rbXMoY3J0Yyk7 CiAJc3RydWN0IGRwdV9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19kcHVfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSk7CkBAIC03MjMsMTYgKzcxOCwxMyBAQCB2b2lkIGRwdV9jcnRjX2NvbW1pdF9raWNr b2ZmKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCURQVV9BVFJBQ0VfQkVHSU4oImNydGNfY29t bWl0Iik7CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGVuY29kZXIsICZkZXYtPm1vZGVfY29uZmln LmVuY29kZXJfbGlzdCwgaGVhZCkgeworCS8qCisJICogRW5jb2RlciB3aWxsIGZsdXNoL3N0YXJ0 IG5vdywgdW5sZXNzIGl0IGhhcyBhIHR4IHBlbmRpbmcuIElmIHNvLCBpdAorCSAqIG1heSBkZWxh eSBhbmQgZmx1c2ggYXQgYW4gaXJxIGV2ZW50IChlLmcuIHBwZG9uZSkKKwkgKi8KKwlkcm1fZm9y X2VhY2hfZW5jb2Rlcl9tYXNrKGVuY29kZXIsIGNydGMtPmRldiwKKwkJCQkgIGNydGMtPnN0YXRl LT5lbmNvZGVyX21hc2spIHsKIAkJc3RydWN0IGRwdV9lbmNvZGVyX2tpY2tvZmZfcGFyYW1zIHBh cmFtcyA9IHsgMCB9OwotCi0JCWlmIChlbmNvZGVyLT5jcnRjICE9IGNydGMpCi0JCQljb250aW51 ZTsKLQotCQkvKgotCQkgKiBFbmNvZGVyIHdpbGwgZmx1c2gvc3RhcnQgbm93LCB1bmxlc3MgaXQg aGFzIGEgdHggcGVuZGluZy4KLQkJICogSWYgc28sIGl0IG1heSBkZWxheSBhbmQgZmx1c2ggYXQg YW4gaXJxIGV2ZW50IChlLmcuIHBwZG9uZSkKLQkJICovCiAJCWRwdV9lbmNvZGVyX3ByZXBhcmVf Zm9yX2tpY2tvZmYoZW5jb2RlciwgJnBhcmFtcyk7CiAJfQogCkBAIC03NTcsMTIgKzc0OSw4IEBA IHZvaWQgZHB1X2NydGNfY29tbWl0X2tpY2tvZmYoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJ ZHB1X3ZiaWZfY2xlYXJfZXJyb3JzKGRwdV9rbXMpOwogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShl bmNvZGVyLCAmZGV2LT5tb2RlX2NvbmZpZy5lbmNvZGVyX2xpc3QsIGhlYWQpIHsKLQkJaWYgKGVu Y29kZXItPmNydGMgIT0gY3J0YykKLQkJCWNvbnRpbnVlOwotCisJZHJtX2Zvcl9lYWNoX2VuY29k ZXJfbWFzayhlbmNvZGVyLCBjcnRjLT5kZXYsIGNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2spCiAJ CWRwdV9lbmNvZGVyX2tpY2tvZmYoZW5jb2Rlcik7Ci0JfQogCiBlbmQ6CiAJcmVpbml0X2NvbXBs ZXRpb24oJmRwdV9jcnRjLT5mcmFtZV9kb25lX2NvbXApOwpAQCAtOTEzLDExICs5MDEsOCBAQCBz dGF0aWMgdm9pZCBkcHVfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWRw dV9jb3JlX3BlcmZfY3J0Y191cGRhdGUoY3J0YywgMCwgdHJ1ZSk7CiAKLQlkcm1fZm9yX2VhY2hf ZW5jb2RlcihlbmNvZGVyLCBjcnRjLT5kZXYpIHsKLQkJaWYgKGVuY29kZXItPmNydGMgIT0gY3J0 YykKLQkJCWNvbnRpbnVlOworCWRybV9mb3JfZWFjaF9lbmNvZGVyX21hc2soZW5jb2RlciwgY3J0 Yy0+ZGV2LCBjcnRjLT5zdGF0ZS0+ZW5jb2Rlcl9tYXNrKQogCQlkcHVfZW5jb2Rlcl9yZWdpc3Rl cl9mcmFtZV9ldmVudF9jYWxsYmFjayhlbmNvZGVyLCBOVUxMLCBOVUxMKTsKLQl9CiAKIAlpZiAo ZHB1X2NydGMtPnBvd2VyX2V2ZW50KQogCQlkcHVfcG93ZXJfaGFuZGxlX3VucmVnaXN0ZXJfZXZl bnQoZHB1X2NydGMtPnBoYW5kbGUsCkBAIC05NTYsMTIgKzk0MSw5IEBAIHN0YXRpYyB2b2lkIGRw dV9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJRFJNX0RFQlVHX0tNUygiY3J0 YyVkXG4iLCBjcnRjLT5iYXNlLmlkKTsKIAlkcHVfY3J0YyA9IHRvX2RwdV9jcnRjKGNydGMpOwog Ci0JZHJtX2Zvcl9lYWNoX2VuY29kZXIoZW5jb2RlciwgY3J0Yy0+ZGV2KSB7Ci0JCWlmIChlbmNv ZGVyLT5jcnRjICE9IGNydGMpCi0JCQljb250aW51ZTsKKwlkcm1fZm9yX2VhY2hfZW5jb2Rlcl9t YXNrKGVuY29kZXIsIGNydGMtPmRldiwgY3J0Yy0+c3RhdGUtPmVuY29kZXJfbWFzaykKIAkJZHB1 X2VuY29kZXJfcmVnaXN0ZXJfZnJhbWVfZXZlbnRfY2FsbGJhY2soZW5jb2RlciwKIAkJCQlkcHVf Y3J0Y19mcmFtZV9ldmVudF9jYiwgKHZvaWQgKiljcnRjKTsKLQl9CiAKIAltdXRleF9sb2NrKCZk cHVfY3J0Yy0+Y3J0Y19sb2NrKTsKIAl0cmFjZV9kcHVfY3J0Y19lbmFibGUoRFJNSUQoY3J0Yyks IHRydWUsIGRwdV9jcnRjKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9k cHUxL2RwdV9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9rbXMuYwpp bmRleCA5ODVjODU1Nzk2YWUuLjc4NzA5Njk5ZmUxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlz cC9kcHUxL2RwdV9rbXMuYwpAQCAtMzIwLDcgKzMyMCwxMCBAQCBzdGF0aWMgdm9pZCBkcHVfa21z X3ByZXBhcmVfY29tbWl0KHN0cnVjdCBtc21fa21zICprbXMsCiAJc3RydWN0IGRwdV9rbXMgKmRw dV9rbXM7CiAJc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdjsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2OworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg KmNydGNfc3RhdGU7CiAJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOworCWludCBpOwogCiAJ aWYgKCFrbXMpCiAJCXJldHVybjsKQEAgLTMzMiw5ICszMzUsMTMgQEAgc3RhdGljIHZvaWQgZHB1 X2ttc19wcmVwYXJlX2NvbW1pdChzdHJ1Y3QgbXNtX2ttcyAqa21zLAogCXByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXBtX3J1bnRpbWVfZ2V0X3N5bmMoJmRwdV9rbXMtPnBkZXYtPmRldik7CiAK LQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGVuY29kZXIsICZkZXYtPm1vZGVfY29uZmlnLmVuY29kZXJf bGlzdCwgaGVhZCkKLQkJaWYgKGVuY29kZXItPmNydGMgIT0gTlVMTCkKKwkvKiBDYWxsIHByZXBh cmVfY29tbWl0IGZvciBhbGwgYWZmZWN0ZWQgZW5jb2RlcnMgKi8KKwlmb3JfZWFjaF9uZXdfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQlkcm1fZm9yX2VhY2hf ZW5jb2Rlcl9tYXNrKGVuY29kZXIsIGNydGMtPmRldiwKKwkJCQkJICBjcnRjX3N0YXRlLT5lbmNv ZGVyX21hc2spIHsKIAkJCWRwdV9lbmNvZGVyX3ByZXBhcmVfY29tbWl0KGVuY29kZXIpOworCQl9 CisJfQogfQogCiAvKgpAQCAtMzQ0LDEzICszNTEsMTcgQEAgc3RhdGljIHZvaWQgZHB1X2ttc19w cmVwYXJlX2NvbW1pdChzdHJ1Y3QgbXNtX2ttcyAqa21zLAogdm9pZCBkcHVfa21zX2VuY29kZXJf ZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIHsKIAljb25zdCBzdHJ1Y3QgZHJt X2VuY29kZXJfaGVscGVyX2Z1bmNzICpmdW5jcyA9IGVuY29kZXItPmhlbHBlcl9wcml2YXRlOwot CXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGVuY29kZXItPmNydGM7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGVuY29kZXItPmRldjsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAKIAkvKiBG b3J3YXJkIHRoaXMgZW5hYmxlIGNhbGwgdG8gdGhlIGNvbW1pdCBob29rICovCiAJaWYgKGZ1bmNz ICYmIGZ1bmNzLT5jb21taXQpCiAJCWZ1bmNzLT5jb21taXQoZW5jb2Rlcik7CiAKLQlpZiAoY3J0 YyAmJiBjcnRjLT5zdGF0ZS0+YWN0aXZlKSB7CisJZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2 KSB7CisJCWlmICghKGNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2sgJiBkcm1fZW5jb2Rlcl9tYXNr KGVuY29kZXIpKSkKKwkJCWNvbnRpbnVlOworCiAJCXRyYWNlX2RwdV9rbXNfZW5jX2VuYWJsZShE Uk1JRChjcnRjKSk7CiAJCWRwdV9jcnRjX2NvbW1pdF9raWNrb2ZmKGNydGMpOwogCX0KLS0gClNl YW4gUGF1bCwgU29mdHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGlu ZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K