From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [DPU PATCH v2] drm/msm: Don't duplicate modeset_enables atomic helper Date: Fri, 16 Mar 2018 15:45:41 -0400 Message-ID: <20180316194541.23514-1-seanpaul@chromium.org> References: <645777c3f76662ce5b0b14bcf7b81acb@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <645777c3f76662ce5b0b14bcf7b81acb-sgV2jX0FEOL9JmXXK+q4OQ@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, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Sean Paul , hoegsberg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, abhinavk-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org SW5zdGVhZCwgc2h1ZmZsZSB0aGluZ3MgYXJvdW5kIHNvIHdlIGtpY2tvZmYgY3J0YyBhZnRlciBl bmFibGluZyBlbmNvZGVyCmR1cmluZyBtb2Rlc2V0cy4gQWxzbyBtb3ZlcyB0aGUgdmJsYW5rIHdh aXQgdG8gYWZ0ZXIgdGhlIGZyYW1lLgoKQ2hhbmdlcyBpbiB2MjoKLSBSZW1vdmUgdGhlIGVuY29k ZXIuY29tbWl0IGhhY2ssIGl0J3Mgbm90IHJlcXVpcmVkIChKZXlrdW1hcikKCkNjOiBKZXlrdW1h ciBTYW5rYXJhbiA8anNhbmthQGNvZGVhdXJvcmEub3JnPgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBh dWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3Av ZHB1MS9kcHVfY3J0Yy5jIHwgICA5ICsrCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9k cHVfa21zLmMgIHwgICA4ICstCiBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9hdG9taWMuYyAgICAg ICAgIHwgMTMyICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE5IGlu c2VydGlvbnMoKyksIDEzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vbXNtL2Rpc3AvZHB1MS9kcHVfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2Rw dTEvZHB1X2NydGMuYwppbmRleCBhM2FiNmVkMmJmMWQuLjk0ZmFiMmRjY2E1YiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2NydGMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfY3J0Yy5jCkBAIC0zNTI1LDYgKzM1MjUsMTIgQEAg c3RhdGljIHZvaWQgZHB1X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlEUFVf RVZUMzJfVkVSQk9TRShEUk1JRChjcnRjKSk7CiAJZHB1X2NydGMgPSB0b19kcHVfY3J0YyhjcnRj KTsKIAorCWlmIChtc21faXNfbW9kZV9zZWFtbGVzcygmY3J0Yy0+c3RhdGUtPmFkanVzdGVkX21v ZGUpIHx8CisJICAgIG1zbV9pc19tb2RlX3NlYW1sZXNzX3ZycigmY3J0Yy0+c3RhdGUtPmFkanVz dGVkX21vZGUpKSB7CisJCURQVV9ERUJVRygiU2tpcHBpbmcgY3J0YyBlbmFibGUsIHNlYW1sZXNz IG1vZGVcbiIpOworCQlyZXR1cm47CisJfQorCiAJcG1fcnVudGltZV9nZXRfc3luYyhjcnRjLT5k ZXYtPmRldik7CiAKIAlkcm1fZm9yX2VhY2hfZW5jb2RlcihlbmNvZGVyLCBjcnRjLT5kZXYpIHsK QEAgLTM1NzIsNiArMzU3OCw5IEBAIHN0YXRpYyB2b2lkIGRwdV9jcnRjX2VuYWJsZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJCURQVV9QT1dFUl9FVkVOVF9QT1NUX0VOQUJMRSB8IERQVV9QT1dF Ul9FVkVOVF9QT1NUX0RJU0FCTEUgfAogCQlEUFVfUE9XRVJfRVZFTlRfUFJFX0RJU0FCTEUsCiAJ CWRwdV9jcnRjX2hhbmRsZV9wb3dlcl9ldmVudCwgY3J0YywgZHB1X2NydGMtPm5hbWUpOworCisJ aWYgKG1zbV9uZWVkc192YmxhbmtfcHJlX21vZGVzZXQoJmNydGMtPnN0YXRlLT5hZGp1c3RlZF9t b2RlKSkKKwkJZHJtX2NydGNfd2FpdF9vbmVfdmJsYW5rKGNydGMpOwogfQogCiBzdHJ1Y3QgcGxh bmVfc3RhdGUgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1 X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jCmluZGV4IDVi YTM0NTM5NWI4Mi4uMmM0YzdmZTFhZmZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNt L2Rpc3AvZHB1MS9kcHVfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEv ZHB1X2ttcy5jCkBAIC00MjIsMTQgKzQyMiwxNCBAQCBzdGF0aWMgdm9pZCBkcHVfa21zX3ByZXBh cmVfY29tbWl0KHN0cnVjdCBtc21fa21zICprbXMsCiAJCQlkcHVfZW5jb2Rlcl9wcmVwYXJlX2Nv bW1pdChlbmNvZGVyKTsKIH0KIAotc3RhdGljIHZvaWQgZHB1X2ttc19jb21taXQoc3RydWN0IG1z bV9rbXMgKmttcywKLQkJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKK3N0YXRp YyB2b2lkIGRwdV9rbXNfY29tbWl0KHN0cnVjdCBtc21fa21zICprbXMsIHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGRy bV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNy dGNfc3RhdGU7CisJc3RydWN0IGRwdV9jcnRjX3N0YXRlICpjc3RhdGU7CiAJaW50IGk7CiAKLQlm b3JfZWFjaF9vbGRfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRl LCBpKSB7CisJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3Rh dGUsIGkpIHsKIAkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpIHsKIAkJCURQVV9FVlQzMihEUk1J RChjcnRjKSk7CiAJCQlkcHVfY3J0Y19jb21taXRfa2lja29mZihjcnRjKTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9t c21fYXRvbWljLmMKaW5kZXggNWNmYjgwMzQ1MDUyLi5mNTc5NGRjZTI1ZGQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9t c20vbXNtX2F0b21pYy5jCkBAIC04NCwxMzEgKzg0LDYgQEAgc3RhdGljIHZvaWQgbXNtX2F0b21p Y193YWl0X2Zvcl9jb21taXRfZG9uZSgKIAl9CiB9CiAKLS8qKgotICogbXNtX2F0b21pY19oZWxw ZXJfY29tbWl0X21vZGVzZXRfZW5hYmxlcyAtIG1vZGVzZXQgY29tbWl0IHRvIGVuYWJsZSBvdXRw dXRzCi0gKiBAZGV2OiBEUk0gZGV2aWNlCi0gKiBAb2xkX3N0YXRlOiBhdG9taWMgc3RhdGUgb2Jq ZWN0IHdpdGggb2xkIHN0YXRlIHN0cnVjdHVyZXMKLSAqCi0gKiBUaGlzIGZ1bmN0aW9uIGVuYWJs ZXMgYWxsIHRoZSBvdXRwdXRzIHdpdGggdGhlIG5ldyBjb25maWd1cmF0aW9uIHdoaWNoIGhhZCB0 bwotICogYmUgdHVybmVkIG9mZiBmb3IgdGhlIHVwZGF0ZS4KLSAqCi0gKiBGb3IgY29tcGF0aWJp bGl0eSB3aXRoIGxlZ2FjeSBjcnRjIGhlbHBlcnMgdGhpcyBzaG91bGQgYmUgY2FsbGVkIGFmdGVy Ci0gKiBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzKCksIHdoaWNoIGlzIHdoYXQgdGhl IGRlZmF1bHQgY29tbWl0IGZ1bmN0aW9uCi0gKiBkb2VzLiBCdXQgZHJpdmVycyB3aXRoIGRpZmZl cmVudCBuZWVkcyBjYW4gZ3JvdXAgdGhlIG1vZGVzZXQgY29tbWl0cyB0b2dldGhlcgotICogYW5k IGRvIHRoZSBwbGFuZSBjb21taXRzIGF0IHRoZSBlbmQuIFRoaXMgaXMgdXNlZnVsIGZvciBkcml2 ZXJzIGRvaW5nIHJ1bnRpbWUKLSAqIFBNIHNpbmNlIHBsYW5lcyB1cGRhdGVzIHRoZW4gb25seSBo YXBwZW4gd2hlbiB0aGUgQ1JUQyBpcyBhY3R1YWxseSBlbmFibGVkLgotICovCi1zdGF0aWMgdm9p ZCBtc21fYXRvbWljX2hlbHBlcl9jb21taXRfbW9kZXNldF9lbmFibGVzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCi0JCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCi17Ci0Jc3Ry dWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGU7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKLQlzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpuZXdf Y29ubl9zdGF0ZTsKLQlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKLQlzdHJ1Y3QgbXNtX2ttcyAqa21zID0gcHJpdi0+a21zOwotCWludCBicmlkZ2VfZW5h YmxlX2NvdW50ID0gMDsKLQlpbnQgaTsKLQotCWZvcl9lYWNoX29sZG5ld19jcnRjX2luX3N0YXRl KG9sZF9zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsCi0JCQluZXdfY3J0Y19zdGF0ZSwgaSkg ewotCQljb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzICpmdW5jczsKLQotCQkvKiBO ZWVkIHRvIGZpbHRlciBvdXQgQ1JUQ3Mgd2hlcmUgb25seSBwbGFuZXMgY2hhbmdlLiAqLwotCQlp ZiAoIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSkKLQkJCWNv bnRpbnVlOwotCi0JCWlmICghbmV3X2NydGNfc3RhdGUtPmFjdGl2ZSkKLQkJCWNvbnRpbnVlOwot Ci0JCWlmIChtc21faXNfbW9kZV9zZWFtbGVzcygmbmV3X2NydGNfc3RhdGUtPm1vZGUpIHx8Ci0J CQkJbXNtX2lzX21vZGVfc2VhbWxlc3NfdnJyKAotCQkJCSZuZXdfY3J0Y19zdGF0ZS0+YWRqdXN0 ZWRfbW9kZSkpCi0JCQljb250aW51ZTsKLQotCQlmdW5jcyA9IGNydGMtPmhlbHBlcl9wcml2YXRl OwotCi0JCWlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlKSB7Ci0JCQlEUk1fREVCVUdfQVRPTUlDKCJl bmFibGluZyBbQ1JUQzolZF1cbiIsCi0JCQkJCSBjcnRjLT5iYXNlLmlkKTsKLQotCQkJaWYgKGZ1 bmNzLT5hdG9taWNfZW5hYmxlKQotCQkJCWZ1bmNzLT5hdG9taWNfZW5hYmxlKGNydGMsIG9sZF9j cnRjX3N0YXRlKTsKLQkJCWVsc2UKLQkJCQlmdW5jcy0+Y29tbWl0KGNydGMpOwotCQl9Ci0KLQkJ aWYgKG1zbV9uZWVkc192YmxhbmtfcHJlX21vZGVzZXQoCi0JCQkJCSZuZXdfY3J0Y19zdGF0ZS0+ YWRqdXN0ZWRfbW9kZSkpCi0JCQlkcm1fY3J0Y193YWl0X29uZV92YmxhbmsoY3J0Yyk7Ci0JfQot Ci0JLyogZW5zdXJlIGJyaWRnZS9lbmNvZGVyIHVwZGF0ZXMgaGFwcGVuIG9uIHNhbWUgdmJsYW5r ICovCi0JbXNtX2F0b21pY193YWl0X2Zvcl9jb21taXRfZG9uZShkZXYsIG9sZF9zdGF0ZSk7Ci0K LQlmb3JfZWFjaF9uZXdfY29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVjdG9yLAot CQkJbmV3X2Nvbm5fc3RhdGUsIGkpIHsKLQkJY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2hlbHBl cl9mdW5jcyAqZnVuY3M7Ci0JCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKLQotCQlpZiAo IW5ld19jb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpCi0JCQljb250aW51ZTsKLQotCQlpZiAoIW5l d19jb25uX3N0YXRlLT5jcnRjLT5zdGF0ZS0+YWN0aXZlIHx8Ci0JCSAgICAhZHJtX2F0b21pY19j cnRjX25lZWRzX21vZGVzZXQoCi0JCQkgICAgbmV3X2Nvbm5fc3RhdGUtPmNydGMtPnN0YXRlKSkK LQkJCWNvbnRpbnVlOwotCi0JCWVuY29kZXIgPSBuZXdfY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVy OwotCQlmdW5jcyA9IGVuY29kZXItPmhlbHBlcl9wcml2YXRlOwotCi0JCURSTV9ERUJVR19BVE9N SUMoImVuYWJsaW5nIFtFTkNPREVSOiVkOiVzXVxuIiwKLQkJCQkgZW5jb2Rlci0+YmFzZS5pZCwg ZW5jb2Rlci0+bmFtZSk7Ci0KLQkJLyoKLQkJICogRWFjaCBlbmNvZGVyIGhhcyBhdCBtb3N0IG9u ZSBjb25uZWN0b3IgKHNpbmNlIHdlIGFsd2F5cyBzdGVhbAotCQkgKiBpdCBhd2F5KSwgc28gd2Ug d29uJ3QgY2FsbCBlbmFibGUgaG9va3MgdHdpY2UuCi0JCSAqLwotCQlkcm1fYnJpZGdlX3ByZV9l bmFibGUoZW5jb2Rlci0+YnJpZGdlKTsKLQkJKyticmlkZ2VfZW5hYmxlX2NvdW50OwotCi0JCWlm IChmdW5jcy0+ZW5hYmxlKQotCQkJZnVuY3MtPmVuYWJsZShlbmNvZGVyKTsKLQkJZWxzZQotCQkJ ZnVuY3MtPmNvbW1pdChlbmNvZGVyKTsKLQl9Ci0KLQlpZiAoa21zLT5mdW5jcy0+Y29tbWl0KSB7 Ci0JCURSTV9ERUJVR19BVE9NSUMoInRyaWdnZXJpbmcgY29tbWl0XG4iKTsKLQkJa21zLT5mdW5j cy0+Y29tbWl0KGttcywgb2xkX3N0YXRlKTsKLQl9Ci0KLQkvKiBJZiBubyBicmlkZ2VzIHdlcmUg cHJlX2VuYWJsZWQsIHNraXAgaXRlcmF0aW5nIG92ZXIgdGhlbSBhZ2FpbiAqLwotCWlmIChicmlk Z2VfZW5hYmxlX2NvdW50ID09IDApCi0JCXJldHVybjsKLQotCWZvcl9lYWNoX25ld19jb25uZWN0 b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25uZWN0b3IsCi0JCQluZXdfY29ubl9zdGF0ZSwgaSkg ewotCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXI7Ci0KLQkJaWYgKCFuZXdfY29ubl9zdGF0 ZS0+YmVzdF9lbmNvZGVyKQotCQkJY29udGludWU7Ci0KLQkJaWYgKCFuZXdfY29ubl9zdGF0ZS0+ Y3J0Yy0+c3RhdGUtPmFjdGl2ZSB8fAotCQkgICAgIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rl c2V0KAotCQkJCSAgICBuZXdfY29ubl9zdGF0ZS0+Y3J0Yy0+c3RhdGUpKQotCQkJY29udGludWU7 Ci0KLQkJZW5jb2RlciA9IG5ld19jb25uX3N0YXRlLT5iZXN0X2VuY29kZXI7Ci0KLQkJRFJNX0RF QlVHX0FUT01JQygiYnJpZGdlIGVuYWJsZSBlbmFibGluZyBbRU5DT0RFUjolZDolc11cbiIsCi0J CQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUpOwotCi0JCWRybV9icmlkZ2VfZW5h YmxlKGVuY29kZXItPmJyaWRnZSk7Ci0JfQotfQotCiAvKiBUaGUgKHBvdGVudGlhbGx5KSBhc3lu Y2hyb25vdXMgcGFydCBvZiB0aGUgY29tbWl0LiAgQXQgdGhpcyBwb2ludAogICogbm90aGluZyBj YW4gZmFpbCBzaG9ydCBvZiBhcm1hZ2VkZG9uLgogICovCkBAIC0yMjcsNyArMTAyLDEyIEBAIHN0 YXRpYyB2b2lkIGNvbXBsZXRlX2NvbW1pdChzdHJ1Y3QgbXNtX2NvbW1pdCAqYykKIAogCWRybV9h dG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXMoZGV2LCBzdGF0ZSwgMCk7CiAKLQltc21fYXRvbWlj X2hlbHBlcl9jb21taXRfbW9kZXNldF9lbmFibGVzKGRldiwgc3RhdGUpOworCWRybV9hdG9taWNf aGVscGVyX2NvbW1pdF9tb2Rlc2V0X2VuYWJsZXMoZGV2LCBzdGF0ZSk7CisKKwlpZiAoa21zLT5m dW5jcy0+Y29tbWl0KSB7CisJCURSTV9ERUJVR19BVE9NSUMoInRyaWdnZXJpbmcgY29tbWl0XG4i KTsKKwkJa21zLT5mdW5jcy0+Y29tbWl0KGttcywgc3RhdGUpOworCX0KIAogCS8qIE5PVEU6IF93 YWl0X2Zvcl92YmxhbmtzKCkgb25seSB3YWl0cyBmb3IgdmJsYW5rIG9uCiAJICogZW5hYmxlZCBD UlRDcy4gIFNvIHdlIGVuZCB1cCBmYXVsdGluZyB3aGVuIGRpc2FibGluZwotLSAKU2VhbiBQYXVs LCBTb2Z0d2FyZSBFbmdpbmVlciwgR29vZ2xlIC8gQ2hyb21pdW0gT1MKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkZyZWVkcmVubyBtYWlsaW5nIGxpc3QK RnJlZWRyZW5vQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ZyZWVkcmVubwo=