From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH v2 15/24] drm/msm: dpu: Stop using encoder->crtc pointer Date: Fri, 16 Nov 2018 13:42:25 -0500 Message-ID: <20181116184238.170034-16-sean@poorly.run> References: <20181116184238.170034-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181116184238.170034-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 dWxkIGJlIHVzZWQgdG8gbWFwIGVuY29kZXIgdG8gY3J0Yy4KCkNoYW5nZXMgaW4gdjI6Ci0gTm9u ZQoKU2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2NydGMuYyB8IDQ2ICsrKysrKysrLS0t LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jICB8 IDE5ICsrKysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMzYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1 X2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9jcnRjLmMKaW5kZXgg MTU2ZjRjNzdjYTQ0Li5hMDA4YTg3YTgxMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9t c20vZGlzcC9kcHUxL2RwdV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2Rw dTEvZHB1X2NydGMuYwpAQCAtMjg0LDkgKzI4NCw5IEBAIGVudW0gZHB1X2ludGZfbW9kZSBkcHVf Y3J0Y19nZXRfaW50Zl9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJcmV0dXJuIElOVEZf TU9ERV9OT05FOwogCX0KIAotCWRybV9mb3JfZWFjaF9lbmNvZGVyKGVuY29kZXIsIGNydGMtPmRl dikKLQkJaWYgKGVuY29kZXItPmNydGMgPT0gY3J0YykKLQkJCXJldHVybiBkcHVfZW5jb2Rlcl9n ZXRfaW50Zl9tb2RlKGVuY29kZXIpOworCS8qIFRPRE86IFJldHVybnMgdGhlIGZpcnN0IElOVEZf TU9ERSwgY291bGQgdGhlcmUgYmUgbXVsdGlwbGUgdmFsdWVzPyAqLworCWRybV9mb3JfZWFjaF9l bmNvZGVyX21hc2soZW5jb2RlciwgY3J0Yy0+ZGV2LCBjcnRjLT5zdGF0ZS0+ZW5jb2Rlcl9tYXNr KQorCQlyZXR1cm4gZHB1X2VuY29kZXJfZ2V0X2ludGZfbW9kZShlbmNvZGVyKTsKIAogCXJldHVy biBJTlRGX01PREVfTk9ORTsKIH0KQEAgLTU1MSwxMyArNTUxLDkgQEAgc3RhdGljIHZvaWQgZHB1 X2NydGNfYXRvbWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJc3Bpbl91bmxvY2tf aXJxcmVzdG9yZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CiAJfQogCi0JbGlzdF9mb3JfZWFj aF9lbnRyeShlbmNvZGVyLCAmZGV2LT5tb2RlX2NvbmZpZy5lbmNvZGVyX2xpc3QsIGhlYWQpIHsK LQkJaWYgKGVuY29kZXItPmNydGMgIT0gY3J0YykKLQkJCWNvbnRpbnVlOwotCi0JCS8qIGVuY29k ZXIgd2lsbCB0cmlnZ2VyIHBlbmRpbmcgbWFzayBub3cgKi8KKwkvKiBlbmNvZGVyIHdpbGwgdHJp Z2dlciBwZW5kaW5nIG1hc2sgbm93ICovCisJZHJtX2Zvcl9lYWNoX2VuY29kZXJfbWFzayhlbmNv ZGVyLCBjcnRjLT5kZXYsIGNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2spCiAJCWRwdV9lbmNvZGVy X3RyaWdnZXJfa2lja29mZl9wZW5kaW5nKGVuY29kZXIpOwotCX0KIAogCS8qCiAJICogSWYgbm8g bWl4ZXJzIGhhdmUgYmVlbiBhbGxvY2F0ZWQgaW4gZHB1X2NydGNfYXRvbWljX2NoZWNrKCksCkBA IC03MDQsNyArNzAwLDYgQEAgc3RhdGljIGludCBfZHB1X2NydGNfd2FpdF9mb3JfZnJhbWVfZG9u ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB2b2lkIGRwdV9jcnRjX2NvbW1pdF9raWNrb2ZmKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXI7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHB1X2NydGMgKmRw dV9jcnRjID0gdG9fZHB1X2NydGMoY3J0Yyk7CiAJc3RydWN0IGRwdV9rbXMgKmRwdV9rbXMgPSBf ZHB1X2NydGNfZ2V0X2ttcyhjcnRjKTsKIAlzdHJ1Y3QgZHB1X2NydGNfc3RhdGUgKmNzdGF0ZSA9 IHRvX2RwdV9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKQEAgLTcyMCwxNiArNzE1LDEzIEBAIHZv aWQgZHB1X2NydGNfY29tbWl0X2tpY2tvZmYoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJRFBV X0FUUkFDRV9CRUdJTigiY3J0Y19jb21taXQiKTsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnkoZW5j b2RlciwgJmRldi0+bW9kZV9jb25maWcuZW5jb2Rlcl9saXN0LCBoZWFkKSB7CisJLyoKKwkgKiBF bmNvZGVyIHdpbGwgZmx1c2gvc3RhcnQgbm93LCB1bmxlc3MgaXQgaGFzIGEgdHggcGVuZGluZy4g SWYgc28sIGl0CisJICogbWF5IGRlbGF5IGFuZCBmbHVzaCBhdCBhbiBpcnEgZXZlbnQgKGUuZy4g cHBkb25lKQorCSAqLworCWRybV9mb3JfZWFjaF9lbmNvZGVyX21hc2soZW5jb2RlciwgY3J0Yy0+ ZGV2LAorCQkJCSAgY3J0Yy0+c3RhdGUtPmVuY29kZXJfbWFzaykgewogCQlzdHJ1Y3QgZHB1X2Vu Y29kZXJfa2lja29mZl9wYXJhbXMgcGFyYW1zID0geyAwIH07Ci0KLQkJaWYgKGVuY29kZXItPmNy dGMgIT0gY3J0YykKLQkJCWNvbnRpbnVlOwotCi0JCS8qCi0JCSAqIEVuY29kZXIgd2lsbCBmbHVz aC9zdGFydCBub3csIHVubGVzcyBpdCBoYXMgYSB0eCBwZW5kaW5nLgotCQkgKiBJZiBzbywgaXQg bWF5IGRlbGF5IGFuZCBmbHVzaCBhdCBhbiBpcnEgZXZlbnQgKGUuZy4gcHBkb25lKQotCQkgKi8K IAkJZHB1X2VuY29kZXJfcHJlcGFyZV9mb3Jfa2lja29mZihlbmNvZGVyLCAmcGFyYW1zKTsKIAl9 CiAKQEAgLTc1NCwxMiArNzQ2LDggQEAgdm9pZCBkcHVfY3J0Y19jb21taXRfa2lja29mZihzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlkcHVfdmJpZl9jbGVhcl9lcnJvcnMoZHB1X2ttcyk7CiAK LQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGVuY29kZXIsICZkZXYtPm1vZGVfY29uZmlnLmVuY29kZXJf bGlzdCwgaGVhZCkgewotCQlpZiAoZW5jb2Rlci0+Y3J0YyAhPSBjcnRjKQotCQkJY29udGludWU7 Ci0KKwlkcm1fZm9yX2VhY2hfZW5jb2Rlcl9tYXNrKGVuY29kZXIsIGNydGMtPmRldiwgY3J0Yy0+ c3RhdGUtPmVuY29kZXJfbWFzaykKIAkJZHB1X2VuY29kZXJfa2lja29mZihlbmNvZGVyKTsKLQl9 CiAKIGVuZDoKIAlyZWluaXRfY29tcGxldGlvbigmZHB1X2NydGMtPmZyYW1lX2RvbmVfY29tcCk7 CkBAIC04ODMsMTEgKzg3MSw4IEBAIHN0YXRpYyB2b2lkIGRwdV9jcnRjX2Rpc2FibGUoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCiAJZHB1X2NvcmVfcGVyZl9jcnRjX3VwZGF0ZShjcnRjLCAwLCB0 cnVlKTsKIAotCWRybV9mb3JfZWFjaF9lbmNvZGVyKGVuY29kZXIsIGNydGMtPmRldikgewotCQlp ZiAoZW5jb2Rlci0+Y3J0YyAhPSBjcnRjKQotCQkJY29udGludWU7CisJZHJtX2Zvcl9lYWNoX2Vu Y29kZXJfbWFzayhlbmNvZGVyLCBjcnRjLT5kZXYsIGNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2sp CiAJCWRwdV9lbmNvZGVyX3JlZ2lzdGVyX2ZyYW1lX2V2ZW50X2NhbGxiYWNrKGVuY29kZXIsIE5V TEwsIE5VTEwpOwotCX0KIAogCW1lbXNldChjc3RhdGUtPm1peGVycywgMCwgc2l6ZW9mKGNzdGF0 ZS0+bWl4ZXJzKSk7CiAJY3N0YXRlLT5udW1fbWl4ZXJzID0gMDsKQEAgLTkyMiwxMiArOTA3LDkg QEAgc3RhdGljIHZvaWQgZHB1X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlE Uk1fREVCVUdfS01TKCJjcnRjJWRcbiIsIGNydGMtPmJhc2UuaWQpOwogCWRwdV9jcnRjID0gdG9f ZHB1X2NydGMoY3J0Yyk7CiAKLQlkcm1fZm9yX2VhY2hfZW5jb2RlcihlbmNvZGVyLCBjcnRjLT5k ZXYpIHsKLQkJaWYgKGVuY29kZXItPmNydGMgIT0gY3J0YykKLQkJCWNvbnRpbnVlOworCWRybV9m b3JfZWFjaF9lbmNvZGVyX21hc2soZW5jb2RlciwgY3J0Yy0+ZGV2LCBjcnRjLT5zdGF0ZS0+ZW5j b2Rlcl9tYXNrKQogCQlkcHVfZW5jb2Rlcl9yZWdpc3Rlcl9mcmFtZV9ldmVudF9jYWxsYmFjayhl bmNvZGVyLAogCQkJCWRwdV9jcnRjX2ZyYW1lX2V2ZW50X2NiLCAodm9pZCAqKWNydGMpOwotCX0K IAogCW11dGV4X2xvY2soJmRwdV9jcnRjLT5jcnRjX2xvY2spOwogCXRyYWNlX2RwdV9jcnRjX2Vu YWJsZShEUk1JRChjcnRjKSwgdHJ1ZSwgZHB1X2NydGMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNw L2RwdTEvZHB1X2ttcy5jCmluZGV4IDFiZWM0NTQwZjNlMS4uNjQxMzRkNjE5NzQ4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfa21zLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jCkBAIC0zMjAsNyArMzIwLDEwIEBAIHN0 YXRpYyB2b2lkIGRwdV9rbXNfcHJlcGFyZV9jb21taXQoc3RydWN0IG1zbV9rbXMgKmttcywKIAlz dHJ1Y3QgZHB1X2ttcyAqZHB1X2ttczsKIAlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2Owog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CisJc3RydWN0IGRybV9jcnRjICpjcnRjOworCXN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29k ZXI7CisJaW50IGk7CiAKIAlpZiAoIWttcykKIAkJcmV0dXJuOwpAQCAtMzMyLDkgKzMzNSwxMyBA QCBzdGF0aWMgdm9pZCBkcHVfa21zX3ByZXBhcmVfY29tbWl0KHN0cnVjdCBtc21fa21zICprbXMs CiAJcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJcG1fcnVudGltZV9nZXRfc3luYygmZHB1X2tt cy0+cGRldi0+ZGV2KTsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnkoZW5jb2RlciwgJmRldi0+bW9k ZV9jb25maWcuZW5jb2Rlcl9saXN0LCBoZWFkKQotCQlpZiAoZW5jb2Rlci0+Y3J0YyAhPSBOVUxM KQorCS8qIENhbGwgcHJlcGFyZV9jb21taXQgZm9yIGFsbCBhZmZlY3RlZCBlbmNvZGVycyAqLwor CWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7 CisJCWRybV9mb3JfZWFjaF9lbmNvZGVyX21hc2soZW5jb2RlciwgY3J0Yy0+ZGV2LAorCQkJCQkg IGNydGNfc3RhdGUtPmVuY29kZXJfbWFzaykgewogCQkJZHB1X2VuY29kZXJfcHJlcGFyZV9jb21t aXQoZW5jb2Rlcik7CisJCX0KKwl9CiB9CiAKIC8qCkBAIC0zNDQsMTMgKzM1MSwxNyBAQCBzdGF0 aWMgdm9pZCBkcHVfa21zX3ByZXBhcmVfY29tbWl0KHN0cnVjdCBtc21fa21zICprbXMsCiB2b2lk IGRwdV9rbXNfZW5jb2Rlcl9lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogewog CWNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3MgKmZ1bmNzID0gZW5jb2Rlci0+ aGVscGVyX3ByaXZhdGU7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjID0gZW5jb2Rlci0+Y3J0YzsK KwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+ZGV2OworCXN0cnVjdCBkcm1fY3J0 YyAqY3J0YzsKIAogCS8qIEZvcndhcmQgdGhpcyBlbmFibGUgY2FsbCB0byB0aGUgY29tbWl0IGhv b2sgKi8KIAlpZiAoZnVuY3MgJiYgZnVuY3MtPmNvbW1pdCkKIAkJZnVuY3MtPmNvbW1pdChlbmNv ZGVyKTsKIAotCWlmIChjcnRjICYmIGNydGMtPnN0YXRlLT5hY3RpdmUpIHsKKwlkcm1fZm9yX2Vh Y2hfY3J0YyhjcnRjLCBkZXYpIHsKKwkJaWYgKCEoY3J0Yy0+c3RhdGUtPmVuY29kZXJfbWFzayAm IGRybV9lbmNvZGVyX21hc2soZW5jb2RlcikpKQorCQkJY29udGludWU7CisKIAkJdHJhY2VfZHB1 X2ttc19lbmNfZW5hYmxlKERSTUlEKGNydGMpKTsKIAkJZHB1X2NydGNfY29tbWl0X2tpY2tvZmYo Y3J0Yyk7CiAJfQotLSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwgR29vZ2xlIC8gQ2hy b21pdW0gT1MKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkZyZWVkcmVubyBtYWlsaW5nIGxpc3QKRnJlZWRyZW5vQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ZyZWVkcmVubwo=