From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 04/15] drm/i915: Replace call to commit_planes_on_crtc with internal update, v2. Date: Wed, 19 Sep 2018 15:56:33 +0200 Message-ID: <20180919135644.14182-5-maarten.lankhorst@linux.intel.com> References: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26C636E4C1 for ; Wed, 19 Sep 2018 13:56:52 +0000 (UTC) In-Reply-To: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org ZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjIGNhbGxzIGJlZ2luX2NvbW1p dCwKdGhlbiBwbGFuZV91cGRhdGUgaG9va3MsIHRoZW4gZmx1c2hfY29tbWl0LiBCZWNhdXNlIHdl IGtlZXAgb3VyIG93bgp2aXNpYmlsaXR5IHRyYWNraW5nIHRocm91Z2ggcGxhbmVfc3RhdGUtPnZp c2libGUgdGhlcmUncyBubyBuZWVkIHRvCnJlbHkgb24gdGhlIGF0b21pYyBob29rcyBmb3IgdGhp cy4KCkJ5IGV4cGxpY2l0bHkgd3JpdGluZyBvdXIgb3duIGhlbHBlciwgd2UgY2FuIHVwZGF0ZSB2 aXNpYmxlIHBsYW5lcwphcyBuZWVkZWQsIHdoaWNoIGlzIHVzZWZ1bCB0byBtYWtlIE5WMTIgc3Vw cG9ydCB3b3JrIGFzIGludGVuZGVkLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBSZXdvcmQgY29tbWl0 IG1lc3NhZ2UuIChNYXR0IFJvcGVyKQotIFJlbmFtZSB0byBpbnRlbF91cGRhdGVfcGxhbmVzX29u X2NydGMoKS4gKE1hdHQpCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F0b21pY19wbGFuZS5jIHwgNDEgKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgIHwgMTAgKysrKy0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICB8ICA0ICsrKwogMyBmaWxlcyBjaGFuZ2Vk LCAzMyBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2F0b21pY19wbGFuZS5jCmluZGV4IGFhYmViZTBkMmU5Yi4uZTA2N2ZiNTMxYTI5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTY0LDI5ICsx NjQsMzMgQEAgc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJCQkJCQkgICB0b19pbnRlbF9wbGFuZV9zdGF0ZShuZXdfcGxhbmVfc3Rh dGUpKTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfYXRvbWljX3VwZGF0ZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRf c3RhdGUpCit2b2lkIGludGVsX3VwZGF0ZV9wbGFuZXNfb25fY3J0YyhzdHJ1Y3QgaW50ZWxfYXRv bWljX3N0YXRlICpvbGRfc3RhdGUsCisJCQkJIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJ CSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCisJCQkJIHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfYXRvbWlj X3N0YXRlICpzdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShvbGRfc3RhdGUtPnN0YXRlKTsK LQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUp OwotCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlID0KLQkJ aW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUoc3RhdGUsIGludGVsX3BsYW5lKTsKLQlz dHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBuZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0YyA/OiBvbGRf c3RhdGUtPmNydGM7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGU7 CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKwl1MzIgdXBkYXRlX21hc2s7CisJaW50IGk7 CisKKwl1cGRhdGVfbWFzayA9IG9sZF9jcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzOworCXVwZGF0 ZV9tYXNrIHw9IG5ld19jcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzOwogCi0JaWYgKG5ld19wbGFu ZV9zdGF0ZS0+YmFzZS52aXNpYmxlKSB7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpuZXdfY3J0Y19zdGF0ZSA9Ci0JCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0 YXRlLCB0b19pbnRlbF9jcnRjKGNydGMpKTsKKwlmb3JfZWFjaF9uZXdfaW50ZWxfcGxhbmVfaW5f c3RhdGUob2xkX3N0YXRlLCBwbGFuZSwgbmV3X3BsYW5lX3N0YXRlLCBpKSB7CisJCWlmIChjcnRj LT5waXBlICE9IHBsYW5lLT5waXBlIHx8CisJCSAgICAhKHVwZGF0ZV9tYXNrICYgQklUKHBsYW5l LT5pZCkpKQorCQkJY29udGludWU7CiAKLQkJdHJhY2VfaW50ZWxfdXBkYXRlX3BsYW5lKHBsYW5l LAotCQkJCQkgdG9faW50ZWxfY3J0YyhjcnRjKSk7CisJCWlmIChuZXdfcGxhbmVfc3RhdGUtPmJh c2UudmlzaWJsZSkgeworCQkJdHJhY2VfaW50ZWxfdXBkYXRlX3BsYW5lKCZwbGFuZS0+YmFzZSwg Y3J0Yyk7CiAKLQkJaW50ZWxfcGxhbmUtPnVwZGF0ZV9wbGFuZShpbnRlbF9wbGFuZSwKLQkJCQkJ ICBuZXdfY3J0Y19zdGF0ZSwgbmV3X3BsYW5lX3N0YXRlKTsKLQl9IGVsc2UgewotCQl0cmFjZV9p bnRlbF9kaXNhYmxlX3BsYW5lKHBsYW5lLAotCQkJCQkgIHRvX2ludGVsX2NydGMoY3J0YykpOwor CQkJcGxhbmUtPnVwZGF0ZV9wbGFuZShwbGFuZSwgbmV3X2NydGNfc3RhdGUsIG5ld19wbGFuZV9z dGF0ZSk7CisJCX0gZWxzZSB7CisJCQl0cmFjZV9pbnRlbF9kaXNhYmxlX3BsYW5lKCZwbGFuZS0+ YmFzZSwgY3J0Yyk7CiAKLQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUoaW50ZWxfcGxhbmUs IHRvX2ludGVsX2NydGMoY3J0YykpOworCQkJcGxhbmUtPmRpc2FibGVfcGxhbmUocGxhbmUsIGNy dGMpOworCQl9CiAJfQogfQogCkBAIC0xOTQsNyArMTk4LDYgQEAgY29uc3Qgc3RydWN0IGRybV9w bGFuZV9oZWxwZXJfZnVuY3MgaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzID0gewogCS5wcmVwYXJl X2ZiID0gaW50ZWxfcHJlcGFyZV9wbGFuZV9mYiwKIAkuY2xlYW51cF9mYiA9IGludGVsX2NsZWFu dXBfcGxhbmVfZmIsCiAJLmF0b21pY19jaGVjayA9IGludGVsX3BsYW5lX2F0b21pY19jaGVjaywK LQkuYXRvbWljX3VwZGF0ZSA9IGludGVsX3BsYW5lX2F0b21pY191cGRhdGUsCiB9OwogCiAvKioK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmNzk4MmYxOGI4ZmUuLjM5NzVm M2FmNGZiNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTA4MTMsOCAr MTA4MTMsNiBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVu Y3MgaW50ZWxfaGVscGVyX2Z1bmNzID0gewotCS5hdG9taWNfYmVnaW4gPSBpbnRlbF9iZWdpbl9j cnRjX2NvbW1pdCwKLQkuYXRvbWljX2ZsdXNoID0gaW50ZWxfZmluaXNoX2NydGNfY29tbWl0LAog CS5hdG9taWNfY2hlY2sgPSBpbnRlbF9jcnRjX2F0b21pY19jaGVjaywKIH07CiAKQEAgLTEyNDgz LDYgKzEyNDgxLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3RydWN0IGRybV9j cnRjICpjcnRjLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqb2xkX2ludGVsX2NzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUob2xkX2Ny dGNfc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9IHRvX2lu dGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpOwogCWJvb2wgbW9kZXNldCA9IG5lZWRzX21v ZGVzZXQobmV3X2NydGNfc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3Bs YW5lX3N0YXRlID0KQEAgLTEyNTAzLDcgKzEyNTAyLDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3Vw ZGF0ZV9jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpZiAobmV3X3BsYW5lX3N0YXRlKQog CQlpbnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMsIHBpcGVfY29uZmlnLCBuZXdfcGxhbmVfc3Rh dGUpOwogCi0JZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKG9sZF9jcnRj X3N0YXRlKTsKKwlpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7 CisKKwlpbnRlbF91cGRhdGVfcGxhbmVzX29uX2NydGModG9faW50ZWxfYXRvbWljX3N0YXRlKHN0 YXRlKSwgaW50ZWxfY3J0YywKKwkJCQkgICAgb2xkX2ludGVsX2NzdGF0ZSwgcGlwZV9jb25maWcp OworCisJaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KGNydGMsIG9sZF9jcnRjX3N0YXRlKTsKIH0K IAogc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGNzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggYmYxYzM4NzI4YTU5Li44MDcz YTg1ZDcxNzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0yMTg4LDYgKzIxODgsMTAg QEAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKIHZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpzdGF0ZSk7CiBleHRlcm4gY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgaW50 ZWxfcGxhbmVfaGVscGVyX2Z1bmNzOwordm9pZCBpbnRlbF91cGRhdGVfcGxhbmVzX29uX2NydGMo c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlLAorCQkJCSBzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKKwkJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl LAorCQkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpOwogaW50IGlu dGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAkJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUsCiAJCQkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5l X3N0YXRlLAotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK