From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH 2/7] drm/msm: dpu: Move atomic_check_plane_state() call to atomic_check Date: Tue, 11 Sep 2018 16:15:18 -0400 Message-ID: <20180911201550.210810-2-sean@poorly.run> References: <20180911201550.210810-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180911201550.210810-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: abhinavk-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, bzwang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org Cc: Rob Clark , Sean Paul List-Id: linux-arm-msm@vger.kernel.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpzcmMvZHN0IHJlY3RzIGFy ZSBjaGVja2VkIGluIGJvdGggYXRvbWljX2NoZWNrIGFuZCBhdG9taWNfdXBkYXRlLCB3aXRoCnRo ZSBtb3JlIGNvbXByZWhlbnNpdmUgY2hlY2sgb2NjdXJyaW5nIGluIGF0b21pY191cGRhdGUsIHdo aWNoIGlzCmJhY2t3YXJkcy4gU28gY29uc29sb2RhdGUgdGhlIGNoZWNrcyBpbiBhdG9taWNfY2hl Y2suCgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfcGxhbmUuYyB8IDU2ICsrKysrKyst LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgNDAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1 X3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfcGxhbmUuYwppbmRl eCAwZjQyOGY2NmI5NTEuLjg1MzkwMmFjNGZiOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L21zbS9kaXNwL2RwdTEvZHB1X3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNw L2RwdTEvZHB1X3BsYW5lLmMKQEAgLTEwNzksMTMgKzEwNzksMjYgQEAgc3RhdGljIGJvb2wgZHB1 X3BsYW5lX3ZhbGlkYXRlX3NyYyhzdHJ1Y3QgZHJtX3JlY3QgKnNyYywKIHN0YXRpYyBpbnQgZHB1 X3BsYW5lX3NzcHBfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlpbnQgcmV0ID0gMDsKKwlpbnQgcmV0ID0g MCwgbWluX3NjYWxlOwogCXN0cnVjdCBkcHVfcGxhbmUgKnBkcHUgPSB0b19kcHVfcGxhbmUocGxh bmUpOworCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9IE5VTEw7CiAJ Y29uc3Qgc3RydWN0IGRwdV9mb3JtYXQgKmZtdDsKIAlzdHJ1Y3QgZHJtX3JlY3Qgc3JjLCBkc3Qs IGZiX3JlY3QgPSB7IDAgfTsKLQl1aW50MzJfdCBtYXhfdXBzY2FsZSA9IDEsIG1heF9kb3duc2Nh bGUgPSAxOwogCXVpbnQzMl90IG1pbl9zcmNfc2l6ZSwgbWF4X2xpbmV3aWR0aDsKLQlpbnQgaHNj YWxlID0gMSwgdnNjYWxlID0gMTsKKworCWlmIChzdGF0ZS0+Y3J0YykKKwkJY3J0Y19zdGF0ZSA9 IHN0YXRlLT5jcnRjLT5zdGF0ZTsKKworCW1pbl9zY2FsZSA9IEZSQUNfMTZfMTYoMSwgcGRwdS0+ cGlwZV9zYmxrLT5tYXhkd25zY2FsZSk7CisJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfY2hlY2tf cGxhbmVfc3RhdGUoc3RhdGUsIGNydGNfc3RhdGUsIG1pbl9zY2FsZSwKKwkJCQkJICBwZHB1LT5w aXBlX3NibGstPm1heHVwc2NhbGUgPDwgMTYsCisJCQkJCSAgdHJ1ZSwgdHJ1ZSk7CisJaWYgKHJl dCkgeworCQlEUFVfRVJST1JfUExBTkUocGRwdSwgIkNoZWNrIHBsYW5lIHN0YXRlIGZhaWxlZCAo JWQpXG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKwlpZiAoIXN0YXRlLT52aXNpYmxlKQor CQlyZXR1cm4gMDsKIAogCXNyYy54MSA9IHN0YXRlLT5zcmNfeCA+PiAxNjsKIAlzcmMueTEgPSBz dGF0ZS0+c3JjX3kgPj4gMTY7CkBAIC0xMDk5LDI1ICsxMTEyLDYgQEAgc3RhdGljIGludCBkcHVf cGxhbmVfc3NwcF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAltYXhf bGluZXdpZHRoID0gcGRwdS0+cGlwZV9zYmxrLT5jb21tb24tPm1heGxpbmV3aWR0aDsKIAotCWlm IChwZHB1LT5mZWF0dXJlcyAmIERQVV9TU1BQX1NDQUxFUikgewotCQltYXhfZG93bnNjYWxlID0g cGRwdS0+cGlwZV9zYmxrLT5tYXhkd25zY2FsZTsKLQkJbWF4X3Vwc2NhbGUgPSBwZHB1LT5waXBl X3NibGstPm1heHVwc2NhbGU7Ci0JfQotCWlmIChkcm1fcmVjdF93aWR0aCgmc3JjKSA8IGRybV9y ZWN0X3dpZHRoKCZkc3QpKQotCQloc2NhbGUgPSBkcm1fcmVjdF9jYWxjX2hzY2FsZSgmc3JjLCAm ZHN0LCAxLCBtYXhfdXBzY2FsZSk7Ci0JZWxzZQotCQloc2NhbGUgPSBkcm1fcmVjdF9jYWxjX2hz Y2FsZSgmZHN0LCAmc3JjLCAxLCBtYXhfZG93bnNjYWxlKTsKLQlpZiAoZHJtX3JlY3RfaGVpZ2h0 KCZzcmMpIDwgZHJtX3JlY3RfaGVpZ2h0KCZkc3QpKQotCQl2c2NhbGUgPSBkcm1fcmVjdF9jYWxj X3ZzY2FsZSgmc3JjLCAmZHN0LCAxLCBtYXhfdXBzY2FsZSk7Ci0JZWxzZQotCQl2c2NhbGUgPSBk cm1fcmVjdF9jYWxjX3ZzY2FsZSgmZHN0LCAmc3JjLCAxLCBtYXhfZG93bnNjYWxlKTsKLQotCURQ VV9ERUJVR19QTEFORShwZHB1LCAiY2hlY2sgJWQgLT4gJWRcbiIsCi0JCWRwdV9wbGFuZV9lbmFi bGVkKHBsYW5lLT5zdGF0ZSksIGRwdV9wbGFuZV9lbmFibGVkKHN0YXRlKSk7Ci0KLQlpZiAoIWRw dV9wbGFuZV9lbmFibGVkKHN0YXRlKSkKLQkJZ290byBleGl0OwotCiAJZm10ID0gdG9fZHB1X2Zv cm1hdChtc21fZnJhbWVidWZmZXJfZm9ybWF0KHN0YXRlLT5mYikpOwogCiAJbWluX3NyY19zaXpl ID0gRFBVX0ZPUk1BVF9JU19ZVVYoZm10KSA/IDIgOiAxOwpAQCAtMTE1NiwxNiArMTE1MCw4IEBA IHN0YXRpYyBpbnQgZHB1X3BsYW5lX3NzcHBfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCQlEUFVfRVJST1JfUExBTkUocGRwdSwgImludmFsaWQgc3JjICIgRFJNX1JFQ1Rf Rk1UICIgbGluZToldVxuIiwKIAkJCQlEUk1fUkVDVF9BUkcoJnNyYyksIG1heF9saW5ld2lkdGgp OwogCQlyZXQgPSAtRTJCSUc7Ci0KLQkvKiBjaGVjayBzY2FsZXIgY2FwYWJpbGl0eSAqLwotCX0g ZWxzZSBpZiAoaHNjYWxlIDwgMCB8fCB2c2NhbGUgPCAwKSB7Ci0JCURQVV9FUlJPUl9QTEFORShw ZHB1LCAiaW52YWxpZCBzY2FsaW5nIHJlcXVlc3RlZCBzcmM9IgotCQkJCURSTV9SRUNUX0ZNVCAi IGRzdD0iIERSTV9SRUNUX0ZNVCAiXG4iLAotCQkJCURSTV9SRUNUX0FSRygmc3JjKSwgRFJNX1JF Q1RfQVJHKCZkc3QpKTsKLQkJcmV0ID0gLUUyQklHOwogCX0KIAotZXhpdDoKIAlyZXR1cm4gcmV0 OwogfQogCkBAIC0xMjM3LDcgKzEyMjMsNiBAQCBzdGF0aWMgaW50IGRwdV9wbGFuZV9zc3BwX2F0 b21pY191cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJY29uc3Qgc3RydWN0IGRwdV9m b3JtYXQgKmZtdDsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmI7Ci0JaW50IHJldCwgbWluX3NjYWxlOwogCiAJaWYgKCFwbGFuZSkgewogCQlEUFVf RVJST1IoImludmFsaWQgcGxhbmVcbiIpOwpAQCAtMTI3NiwxNSArMTI2MSw2IEBAIHN0YXRpYyBp bnQgZHB1X3BsYW5lX3NzcHBfYXRvbWljX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAlwZHB1LT5pc19ydF9waXBlID0gKGRwdV9jcnRjX2dldF9jbGllbnRfdHlwZShjcnRjKSAhPSBO UlRfQ0xJRU5UKTsKIAlfZHB1X3BsYW5lX3NldF9xb3NfY3RybChwbGFuZSwgZmFsc2UsIERQVV9Q TEFORV9RT1NfUEFOSUNfQ1RSTCk7CiAKLQltaW5fc2NhbGUgPSBGUkFDXzE2XzE2KDEsIHBkcHUt PnBpcGVfc2Jsay0+bWF4ZHduc2NhbGUpOwotCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNr X3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLT5zdGF0ZSwgbWluX3NjYWxlLAotCQkJCQkgIHBkcHUt PnBpcGVfc2Jsay0+bWF4dXBzY2FsZSA8PCAxNiwKLQkJCQkJICB0cnVlLCBmYWxzZSk7Ci0JaWYg KHJldCkgewotCQlEUFVfRVJST1JfUExBTkUocGRwdSwgIkNoZWNrIHBsYW5lIHN0YXRlIGZhaWxl ZCAoJWQpXG4iLCByZXQpOwotCQlyZXR1cm4gcmV0OwotCX0KLQogCURQVV9ERUJVR19QTEFORShw ZHB1LCAiRkJbJXVdICIgRFJNX1JFQ1RfRlBfRk1UICItPmNydGMldSAiIERSTV9SRUNUX0ZNVAog CQkJIiwgJTQuNHMgdWJ3YyAlZFxuIiwgZmItPmJhc2UuaWQsIERSTV9SRUNUX0ZQX0FSRygmc3Rh dGUtPnNyYyksCiAJCQljcnRjLT5iYXNlLmlkLCBEUk1fUkVDVF9BUkcoJnN0YXRlLT5kc3QpLAot LSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwgR29vZ2xlIC8gQ2hyb21pdW0gT1MKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkZyZWVkcmVubyBt YWlsaW5nIGxpc3QKRnJlZWRyZW5vQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ZyZWVkcmVubwo=