From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH v2 2/7] drm/msm: dpu: Move atomic_check_plane_state() call to atomic_check Date: Wed, 12 Sep 2018 09:54:54 -0400 Message-ID: <20180912135459.216217-2-sean@poorly.run> References: <20180912135459.216217-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180912135459.216217-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: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: bzwang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, Sean Paul , abhinavk-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpzcmMvZHN0IHJlY3RzIGFy ZSBjaGVja2VkIGluIGJvdGggYXRvbWljX2NoZWNrIGFuZCBhdG9taWNfdXBkYXRlLCB3aXRoCnRo ZSBtb3JlIGNvbXByZWhlbnNpdmUgY2hlY2sgb2NjdXJyaW5nIGluIGF0b21pY191cGRhdGUsIHdo aWNoIGlzCmJhY2t3YXJkcy4gU28gY29uc29sb2RhdGUgdGhlIGNoZWNrcyBpbiBhdG9taWNfY2hl Y2suCgpDaGFuZ2VzIGluIHYyOgotIFVzZSB0aGUgY29ycmVjdCBjcnRjIHN0YXRlIChKZXlrdW1h cikKCkNjOiBKZXlrdW1hciBTYW5rYXJhbiA8anNhbmthQGNvZGVhdXJvcmEub3JnPgpTaWduZWQt b2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfcGxhbmUuYyB8IDU3ICsrKysrKystLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgNDAgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X3BsYW5lLmMgYi9k cml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfcGxhbmUuYwppbmRleCAwZjQyOGY2NmI5 NTEuLjk2ZTA0MmI2NmNkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2Rw dTEvZHB1X3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X3Bs YW5lLmMKQEAgLTEwNzksMTMgKzEwNzksMjcgQEAgc3RhdGljIGJvb2wgZHB1X3BsYW5lX3ZhbGlk YXRlX3NyYyhzdHJ1Y3QgZHJtX3JlY3QgKnNyYywKIHN0YXRpYyBpbnQgZHB1X3BsYW5lX3NzcHBf YXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpzdGF0ZSkKIHsKLQlpbnQgcmV0ID0gMDsKKwlpbnQgcmV0ID0gMCwgbWluX3NjYWxl OwogCXN0cnVjdCBkcHVfcGxhbmUgKnBkcHUgPSB0b19kcHVfcGxhbmUocGxhbmUpOworCWNvbnN0 IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9IE5VTEw7CiAJY29uc3Qgc3RydWN0 IGRwdV9mb3JtYXQgKmZtdDsKIAlzdHJ1Y3QgZHJtX3JlY3Qgc3JjLCBkc3QsIGZiX3JlY3QgPSB7 IDAgfTsKLQl1aW50MzJfdCBtYXhfdXBzY2FsZSA9IDEsIG1heF9kb3duc2NhbGUgPSAxOwogCXVp bnQzMl90IG1pbl9zcmNfc2l6ZSwgbWF4X2xpbmV3aWR0aDsKLQlpbnQgaHNjYWxlID0gMSwgdnNj YWxlID0gMTsKKworCWlmIChzdGF0ZS0+Y3J0YykKKwkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNf Z2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLT5zdGF0ZSwKKwkJCQkJCQkgICBzdGF0ZS0+Y3J0Yyk7 CisKKwltaW5fc2NhbGUgPSBGUkFDXzE2XzE2KDEsIHBkcHUtPnBpcGVfc2Jsay0+bWF4ZHduc2Nh bGUpOworCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lX3N0YXRlKHN0YXRlLCBj cnRjX3N0YXRlLCBtaW5fc2NhbGUsCisJCQkJCSAgcGRwdS0+cGlwZV9zYmxrLT5tYXh1cHNjYWxl IDw8IDE2LAorCQkJCQkgIHRydWUsIHRydWUpOworCWlmIChyZXQpIHsKKwkJRFBVX0VSUk9SX1BM QU5FKHBkcHUsICJDaGVjayBwbGFuZSBzdGF0ZSBmYWlsZWQgKCVkKVxuIiwgcmV0KTsKKwkJcmV0 dXJuIHJldDsKKwl9CisJaWYgKCFzdGF0ZS0+dmlzaWJsZSkKKwkJcmV0dXJuIDA7CiAKIAlzcmMu eDEgPSBzdGF0ZS0+c3JjX3ggPj4gMTY7CiAJc3JjLnkxID0gc3RhdGUtPnNyY195ID4+IDE2OwpA QCAtMTA5OSwyNSArMTExMyw2IEBAIHN0YXRpYyBpbnQgZHB1X3BsYW5lX3NzcHBfYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJbWF4X2xpbmV3aWR0aCA9IHBkcHUtPnBp cGVfc2Jsay0+Y29tbW9uLT5tYXhsaW5ld2lkdGg7CiAKLQlpZiAocGRwdS0+ZmVhdHVyZXMgJiBE UFVfU1NQUF9TQ0FMRVIpIHsKLQkJbWF4X2Rvd25zY2FsZSA9IHBkcHUtPnBpcGVfc2Jsay0+bWF4 ZHduc2NhbGU7Ci0JCW1heF91cHNjYWxlID0gcGRwdS0+cGlwZV9zYmxrLT5tYXh1cHNjYWxlOwot CX0KLQlpZiAoZHJtX3JlY3Rfd2lkdGgoJnNyYykgPCBkcm1fcmVjdF93aWR0aCgmZHN0KSkKLQkJ aHNjYWxlID0gZHJtX3JlY3RfY2FsY19oc2NhbGUoJnNyYywgJmRzdCwgMSwgbWF4X3Vwc2NhbGUp OwotCWVsc2UKLQkJaHNjYWxlID0gZHJtX3JlY3RfY2FsY19oc2NhbGUoJmRzdCwgJnNyYywgMSwg bWF4X2Rvd25zY2FsZSk7Ci0JaWYgKGRybV9yZWN0X2hlaWdodCgmc3JjKSA8IGRybV9yZWN0X2hl aWdodCgmZHN0KSkKLQkJdnNjYWxlID0gZHJtX3JlY3RfY2FsY192c2NhbGUoJnNyYywgJmRzdCwg MSwgbWF4X3Vwc2NhbGUpOwotCWVsc2UKLQkJdnNjYWxlID0gZHJtX3JlY3RfY2FsY192c2NhbGUo JmRzdCwgJnNyYywgMSwgbWF4X2Rvd25zY2FsZSk7Ci0KLQlEUFVfREVCVUdfUExBTkUocGRwdSwg ImNoZWNrICVkIC0+ICVkXG4iLAotCQlkcHVfcGxhbmVfZW5hYmxlZChwbGFuZS0+c3RhdGUpLCBk cHVfcGxhbmVfZW5hYmxlZChzdGF0ZSkpOwotCi0JaWYgKCFkcHVfcGxhbmVfZW5hYmxlZChzdGF0 ZSkpCi0JCWdvdG8gZXhpdDsKLQogCWZtdCA9IHRvX2RwdV9mb3JtYXQobXNtX2ZyYW1lYnVmZmVy X2Zvcm1hdChzdGF0ZS0+ZmIpKTsKIAogCW1pbl9zcmNfc2l6ZSA9IERQVV9GT1JNQVRfSVNfWVVW KGZtdCkgPyAyIDogMTsKQEAgLTExNTYsMTYgKzExNTEsOCBAQCBzdGF0aWMgaW50IGRwdV9wbGFu ZV9zc3BwX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJRFBVX0VSUk9S X1BMQU5FKHBkcHUsICJpbnZhbGlkIHNyYyAiIERSTV9SRUNUX0ZNVCAiIGxpbmU6JXVcbiIsCiAJ CQkJRFJNX1JFQ1RfQVJHKCZzcmMpLCBtYXhfbGluZXdpZHRoKTsKIAkJcmV0ID0gLUUyQklHOwot Ci0JLyogY2hlY2sgc2NhbGVyIGNhcGFiaWxpdHkgKi8KLQl9IGVsc2UgaWYgKGhzY2FsZSA8IDAg fHwgdnNjYWxlIDwgMCkgewotCQlEUFVfRVJST1JfUExBTkUocGRwdSwgImludmFsaWQgc2NhbGlu ZyByZXF1ZXN0ZWQgc3JjPSIKLQkJCQlEUk1fUkVDVF9GTVQgIiBkc3Q9IiBEUk1fUkVDVF9GTVQg IlxuIiwKLQkJCQlEUk1fUkVDVF9BUkcoJnNyYyksIERSTV9SRUNUX0FSRygmZHN0KSk7Ci0JCXJl dCA9IC1FMkJJRzsKIAl9CiAKLWV4aXQ6CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMTIzNyw3ICsx MjI0LDYgQEAgc3RhdGljIGludCBkcHVfcGxhbmVfc3NwcF9hdG9taWNfdXBkYXRlKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCWNvbnN0IHN0cnVjdCBkcHVfZm9ybWF0ICpmbXQ7CiAJc3RydWN0 IGRybV9jcnRjICpjcnRjOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwotCWludCByZXQs IG1pbl9zY2FsZTsKIAogCWlmICghcGxhbmUpIHsKIAkJRFBVX0VSUk9SKCJpbnZhbGlkIHBsYW5l XG4iKTsKQEAgLTEyNzYsMTUgKzEyNjIsNiBAQCBzdGF0aWMgaW50IGRwdV9wbGFuZV9zc3BwX2F0 b21pY191cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJcGRwdS0+aXNfcnRfcGlwZSA9 IChkcHVfY3J0Y19nZXRfY2xpZW50X3R5cGUoY3J0YykgIT0gTlJUX0NMSUVOVCk7CiAJX2RwdV9w bGFuZV9zZXRfcW9zX2N0cmwocGxhbmUsIGZhbHNlLCBEUFVfUExBTkVfUU9TX1BBTklDX0NUUkwp OwogCi0JbWluX3NjYWxlID0gRlJBQ18xNl8xNigxLCBwZHB1LT5waXBlX3NibGstPm1heGR3bnNj YWxlKTsKLQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19wbGFuZV9zdGF0ZShzdGF0ZSwg Y3J0Yy0+c3RhdGUsIG1pbl9zY2FsZSwKLQkJCQkJICBwZHB1LT5waXBlX3NibGstPm1heHVwc2Nh bGUgPDwgMTYsCi0JCQkJCSAgdHJ1ZSwgZmFsc2UpOwotCWlmIChyZXQpIHsKLQkJRFBVX0VSUk9S X1BMQU5FKHBkcHUsICJDaGVjayBwbGFuZSBzdGF0ZSBmYWlsZWQgKCVkKVxuIiwgcmV0KTsKLQkJ cmV0dXJuIHJldDsKLQl9Ci0KIAlEUFVfREVCVUdfUExBTkUocGRwdSwgIkZCWyV1XSAiIERSTV9S RUNUX0ZQX0ZNVCAiLT5jcnRjJXUgIiBEUk1fUkVDVF9GTVQKIAkJCSIsICU0LjRzIHVid2MgJWRc biIsIGZiLT5iYXNlLmlkLCBEUk1fUkVDVF9GUF9BUkcoJnN0YXRlLT5zcmMpLAogCQkJY3J0Yy0+ YmFzZS5pZCwgRFJNX1JFQ1RfQVJHKCZzdGF0ZS0+ZHN0KSwKLS0gClNlYW4gUGF1bCwgU29mdHdh cmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVu b0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9mcmVlZHJlbm8K