From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 5/8] drm/i915: Replace call to commit_planes_on_crtc with internal update, v2. Date: Thu, 20 Sep 2018 12:27:08 +0200 Message-ID: <20180920102711.4184-6-maarten.lankhorst@linux.intel.com> References: <20180920102711.4184-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 498356E581 for ; Thu, 20 Sep 2018 10:27:26 +0000 (UTC) In-Reply-To: <20180920102711.4184-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 bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWNfcGxhbmUuYyB8IDQxICsrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICB8IDEwICsrKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgNCArKysKIDMgZmlsZXMgY2hhbmdlZCwgMzMg aW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWNfcGxhbmUuYwppbmRleCBmNzBlOWNiOWNmMDIuLmM3ZTU1ZjFjMDMyZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTE2NiwyOSArMTY2LDMz IEBAIHN0YXRpYyBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCQkJCQkJICAgdG9faW50ZWxfcGxhbmVfc3RhdGUobmV3X3BsYW5lX3N0YXRlKSk7 CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3BsYW5lX2F0b21pY191cGRhdGUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCi0JCQkJICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3N0YXRl KQordm9pZCBpbnRlbF91cGRhdGVfcGxhbmVzX29uX2NydGMoc3RydWN0IGludGVsX2F0b21pY19z dGF0ZSAqb2xkX3N0YXRlLAorCQkJCSBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJCSBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUob2xkX3N0YXRlLT5zdGF0ZSk7Ci0Jc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLQlj b25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSA9Ci0JCWludGVs X2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKHN0YXRlLCBpbnRlbF9wbGFuZSk7Ci0Jc3RydWN0 IGRybV9jcnRjICpjcnRjID0gbmV3X3BsYW5lX3N0YXRlLT5iYXNlLmNydGMgPzogb2xkX3N0YXRl LT5jcnRjOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlOworCXN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7CisJdTMyIHVwZGF0ZV9tYXNrOworCWludCBpOworCisJ dXBkYXRlX21hc2sgPSBvbGRfY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lczsKKwl1cGRhdGVfbWFz ayB8PSBuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lczsKIAotCWlmIChuZXdfcGxhbmVfc3Rh dGUtPmJhc2UudmlzaWJsZSkgewotCQljb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3 X2NydGNfc3RhdGUgPQotCQkJaW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwg dG9faW50ZWxfY3J0YyhjcnRjKSk7CisJZm9yX2VhY2hfbmV3X2ludGVsX3BsYW5lX2luX3N0YXRl KG9sZF9zdGF0ZSwgcGxhbmUsIG5ld19wbGFuZV9zdGF0ZSwgaSkgeworCQlpZiAoY3J0Yy0+cGlw ZSAhPSBwbGFuZS0+cGlwZSB8fAorCQkgICAgISh1cGRhdGVfbWFzayAmIEJJVChwbGFuZS0+aWQp KSkKKwkJCWNvbnRpbnVlOwogCi0JCXRyYWNlX2ludGVsX3VwZGF0ZV9wbGFuZShwbGFuZSwKLQkJ CQkJIHRvX2ludGVsX2NydGMoY3J0YykpOworCQlpZiAobmV3X3BsYW5lX3N0YXRlLT5iYXNlLnZp c2libGUpIHsKKwkJCXRyYWNlX2ludGVsX3VwZGF0ZV9wbGFuZSgmcGxhbmUtPmJhc2UsIGNydGMp OwogCi0JCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUoaW50ZWxfcGxhbmUsCi0JCQkJCSAgbmV3 X2NydGNfc3RhdGUsIG5ld19wbGFuZV9zdGF0ZSk7Ci0JfSBlbHNlIHsKLQkJdHJhY2VfaW50ZWxf ZGlzYWJsZV9wbGFuZShwbGFuZSwKLQkJCQkJICB0b19pbnRlbF9jcnRjKGNydGMpKTsKKwkJCXBs YW5lLT51cGRhdGVfcGxhbmUocGxhbmUsIG5ld19jcnRjX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUp OworCQl9IGVsc2UgeworCQkJdHJhY2VfaW50ZWxfZGlzYWJsZV9wbGFuZSgmcGxhbmUtPmJhc2Us IGNydGMpOwogCi0JCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKGludGVsX3BsYW5lLCB0b19p bnRlbF9jcnRjKGNydGMpKTsKKwkJCXBsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjKTsK KwkJfQogCX0KIH0KIApAQCAtMTk2LDcgKzIwMCw2IEBAIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVf aGVscGVyX2Z1bmNzIGludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyA9IHsKIAkucHJlcGFyZV9mYiA9 IGludGVsX3ByZXBhcmVfcGxhbmVfZmIsCiAJLmNsZWFudXBfZmIgPSBpbnRlbF9jbGVhbnVwX3Bs YW5lX2ZiLAogCS5hdG9taWNfY2hlY2sgPSBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2ssCi0JLmF0 b21pY191cGRhdGUgPSBpbnRlbF9wbGFuZV9hdG9taWNfdXBkYXRlLAogfTsKIAogLyoqCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMTg2NjM2Mjc5M2Y3Li4wMjM3NDE4NWI5 OTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEwODExLDggKzEwODEx LDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzIGlu dGVsX2hlbHBlcl9mdW5jcyA9IHsKLQkuYXRvbWljX2JlZ2luID0gaW50ZWxfYmVnaW5fY3J0Y19j b21taXQsCi0JLmF0b21pY19mbHVzaCA9IGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdCwKIAkuYXRv bWljX2NoZWNrID0gaW50ZWxfY3J0Y19hdG9taWNfY2hlY2ssCiB9OwogCkBAIC0xMjQ4MSw2ICsx MjQ3OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKm9sZF9pbnRlbF9jc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0 YXRlKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPSB0b19pbnRlbF9j cnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKIAlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0 KG5ld19jcnRjX3N0YXRlKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9z dGF0ZSA9CkBAIC0xMjUwMSw3ICsxMjUwMCwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVf Y3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKG5ld19wbGFuZV9zdGF0ZSkKIAkJaW50 ZWxfZmJjX2VuYWJsZShpbnRlbF9jcnRjLCBwaXBlX2NvbmZpZywgbmV3X3BsYW5lX3N0YXRlKTsK IAotCWRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyhvbGRfY3J0Y19zdGF0 ZSk7CisJaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoY3J0Yywgb2xkX2NydGNfc3RhdGUpOworCisJ aW50ZWxfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSks IGludGVsX2NydGMsCisJCQkJICAgIG9sZF9pbnRlbF9jc3RhdGUsIHBpcGVfY29uZmlnKTsKKwor CWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7CiB9CiAKIHN0 YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGJmMWMzODcyOGE1OS4uODA3M2E4NWQ3 MTc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMjE4OCw2ICsyMTg4LDEwIEBAIHN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKmludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSk7CiB2b2lkIGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3Rh dGUpOwogZXh0ZXJuIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzIGludGVsX3Bs YW5lX2hlbHBlcl9mdW5jczsKK3ZvaWQgaW50ZWxfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSwKKwkJCQkgc3RydWN0IGludGVsX2NydGMg KmNydGMsCisJCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJ CQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlKTsKIGludCBpbnRlbF9w bGFuZV9hdG9taWNfY2hlY2tfd2l0aF9zdGF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqb2xkX2NydGNfc3RhdGUsCiAJCQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCQkJCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0 ZSwKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==