From: Maarten Lankhorst Subject: [PATCH 13/24] drm/i915: Stop using drm_atomic_helper_check_planes() Date: Fri, 4 Oct 2019 13:35:03 +0200 Message-ID: <20191004113514.17064-14-maarten.lankhorst@linux.intel.com> References: <20191004113514.17064-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 150696EB33 for ; Fri, 4 Oct 2019 11:35:23 +0000 (UTC) In-Reply-To: <20191004113514.17064-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl IG5lZWQgdG8gaW5zZXJ0IHN0dWZmIGJldHdlZW4gdGhlIHBsYW5lIGFuZCBjcnRjIC5hdG9taWNf Y2hlY2soKQpkcm1fYXRvbWljX2hlbHBlcl9jaGVja19wbGFuZXMoKSBkb2Vzbid0IGFsbG93IHVz IHRvIGRvIHRoYXQgc28Kc3RvcCB1c2luZyBpdCBhbmQgaGFuZCByb2xsIHRoZSBsb29wcyBpbnN0 ZWFkLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFN0YW5pc2xhdiBMaXNvdnNraXkgPHN0YW5pc2xhdi5s aXNvdnNraXlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIC4uLi9ncHUvZHJtL2k5MTUvZGlz cGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8IDEwICstLS0KIC4uLi9ncHUvZHJtL2k5MTUvZGlz cGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaCB8ICAyICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfZGlzcGxheS5jICB8IDU3ICsrKysrKysrKysrKysrKy0tLS0KIDMgZmlsZXMg Y2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXggY2MxNTRj ZmEzMzgxLi5jZTc1Y2YxZGM2NWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlz cGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMjE5LDE0ICsyMTksMTEgQEAgZ2V0X2NydGNf ZnJvbV9zdGF0ZXMoY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3Rh dGUsCiAJcmV0dXJuIE5VTEw7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFuZSwKLQkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9z dGF0ZSAqX25ld19wbGFuZV9zdGF0ZSkKK2ludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3Ry dWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgICAgIHN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUpCiB7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5l KF9wbGFuZSk7Ci0Jc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPQotCQl0b19pbnRl bF9hdG9taWNfc3RhdGUoX25ld19wbGFuZV9zdGF0ZS0+c3RhdGUpOwogCXN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlID0KLQkJdG9faW50ZWxfcGxhbmVfc3RhdGUoX25l d19wbGFuZV9zdGF0ZSk7CisJCWludGVsX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKHN0YXRl LCBwbGFuZSk7CiAJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3Rh dGUgPQogCQlpbnRlbF9hdG9taWNfZ2V0X29sZF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOwog CXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0KQEAgLTQyMyw1ICs0MjAsNCBAQCBpbnRlbF9hdG9t aWNfZ2V0X3BsYW5lX3N0YXRlX2FmdGVyX2NoZWNrKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUg KnN0YXRlLAogY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgaW50ZWxfcGxhbmVf aGVscGVyX2Z1bmNzID0gewogCS5wcmVwYXJlX2ZiID0gaW50ZWxfcHJlcGFyZV9wbGFuZV9mYiwK IAkuY2xlYW51cF9mYiA9IGludGVsX2NsZWFudXBfcGxhbmVfZmIsCi0JLmF0b21pY19jaGVjayA9 IGludGVsX3BsYW5lX2F0b21pY19jaGVjaywKIH07CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaAppbmRleCBmZDRiOTYwMTM0NTQuLjEyMzQw NGE5Y2YyMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9h dG9taWNfcGxhbmUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0 b21pY19wbGFuZS5oCkBAIC00Myw2ICs0Myw4IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hl Y2tfd2l0aF9zdGF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfCiAJ CQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCQljb25zdCBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwKIAkJCQkJc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICppbnRlbF9zdGF0ZSk7CitpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNr KHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkJICAgICBzdHJ1Y3QgaW50ZWxf cGxhbmUgKnBsYW5lKTsKIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAkJCQkgICAgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJICAgIGNvbnN0IHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmZmRlNGI4YjhiZTkuLmNhYWI4Y2ZkZGNiZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEx Nzk5LDE1ICsxMTc5OSwxNCBAQCBzdGF0aWMgYm9vbCBjOF9wbGFuZXNfY2hhbmdlZChjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCiAJcmV0dXJuICFvbGRfY3J0 Y19zdGF0ZS0+YzhfcGxhbmVzICE9ICFuZXdfY3J0Y19zdGF0ZS0+YzhfcGxhbmVzOwogfQogCi1z dGF0aWMgaW50IGludGVsX2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqX2NydGMs Ci0JCQkJICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpfY3J0Y19zdGF0ZSkKK3N0YXRpYyBpbnQg aW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUs CisJCQkJICAgc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGludGVsX2NydGMg KmNydGMgPSB0b19pbnRlbF9jcnRjKF9jcnRjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSA9Ci0JCXRvX2ludGVsX2NydGNfc3RhdGUoX2NydGNfc3RhdGUpOwot CWludCByZXQ7CisJCWludGVsX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIGNydGMp OwogCWJvb2wgbW9kZV9jaGFuZ2VkID0gbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKTsKKwlpbnQg cmV0OwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1ICYmICFJU19HNFgoZGV2X3ByaXYp ICYmCiAJICAgIG1vZGVfY2hhbmdlZCAmJiAhY3J0Y19zdGF0ZS0+aHcuYWN0aXZlKQpAQCAtMTE4 NzksMTAgKzExODc4LDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1 Y3QgZHJtX2NydGMgKl9jcnRjLAogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzIGludGVsX2hlbHBlcl9mdW5jcyA9IHsKLQkuYXRvbWlj X2NoZWNrID0gaW50ZWxfY3J0Y19hdG9taWNfY2hlY2ssCi19OwotCiBzdGF0aWMgdm9pZCBpbnRl bF9tb2Rlc2V0X3VwZGF0ZV9jb25uZWN0b3JfYXRvbWljX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiB7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwpAQCAtMTM1ODEs NiArMTM1NzYsNDIgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19jaGVja19mYXN0c2V0KGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGEKIAluZXdfY3J0Y19zdGF0ZS0+ aGFzX2RycnMgPSBvbGRfY3J0Y19zdGF0ZS0+aGFzX2RycnM7CiB9CiAKK3N0YXRpYyBpbnQgaW50 ZWxfYXRvbWljX2NoZWNrX3BsYW5lcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkK K3sKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCXN0cnVjdCBpbnRl bF9wbGFuZSAqcGxhbmU7CisJaW50IGksIHJldDsKKworCWZvcl9lYWNoX25ld19pbnRlbF9wbGFu ZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CisJCXJldCA9IGludGVs X3BsYW5lX2F0b21pY19jaGVjayhzdGF0ZSwgcGxhbmUpOworCQlpZiAocmV0KSB7CisJCQlEUk1f REVCVUdfQVRPTUlDKCJbUExBTkU6JWQ6JXNdIGF0b21pYyBkcml2ZXIgY2hlY2sgZmFpbGVkXG4i LAorCQkJCQkgcGxhbmUtPmJhc2UuYmFzZS5pZCwgcGxhbmUtPmJhc2UubmFtZSk7CisJCQlyZXR1 cm4gcmV0OworCQl9CisJfQorCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgaW50ZWxfYXRv bWljX2NoZWNrX2NydGNzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQoreworCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjICpj cnRjOworCWludCBpOworCisJZm9yX2VhY2hfbmV3X2ludGVsX2NydGNfaW5fc3RhdGUoc3RhdGUs IGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwkJaW50IHJldCA9IGludGVsX2NydGNfYXRvbWljX2No ZWNrKHN0YXRlLCBjcnRjKTsKKwkJaWYgKHJldCkgeworCQkJRFJNX0RFQlVHX0FUT01JQygiW0NS VEM6JWQ6JXNdIGF0b21pYyBkcml2ZXIgY2hlY2sgZmFpbGVkXG4iLAorCQkJCQkgY3J0Yy0+YmFz ZS5iYXNlLmlkLCBjcnRjLT5iYXNlLm5hbWUpOworCQkJcmV0dXJuIHJldDsKKwkJfQorCX0KKwor CXJldHVybiAwOworfQorCiAvKioKICAqIGludGVsX2F0b21pY19jaGVjayAtIHZhbGlkYXRlIHN0 YXRlIG9iamVjdAogICogQGRldjogZHJtIGRldmljZQpAQCAtMTM2NTAsNyArMTM2ODEsMTEgQEAg c3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlp ZiAocmV0KQogCQlnb3RvIGZhaWw7CiAKLQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19w bGFuZXMoZGV2LCAmc3RhdGUtPmJhc2UpOworCXJldCA9IGludGVsX2F0b21pY19jaGVja19wbGFu ZXMoc3RhdGUpOworCWlmIChyZXQpCisJCWdvdG8gZmFpbDsKKworCXJldCA9IGludGVsX2F0b21p Y19jaGVja19jcnRjcyhzdGF0ZSk7CiAJaWYgKHJldCkKIAkJZ290byBmYWlsOwogCkBAIC0xNTI0 MSw4ICsxNTI3Niw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19pbml0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJCWRldl9wcml2LT5wbGFuZV90 b19jcnRjX21hcHBpbmdbaTl4eF9wbGFuZV0gPSBpbnRlbF9jcnRjOwogCX0KIAotCWRybV9jcnRj X2hlbHBlcl9hZGQoJmludGVsX2NydGMtPmJhc2UsICZpbnRlbF9oZWxwZXJfZnVuY3MpOwotCiAJ aW50ZWxfY29sb3JfaW5pdChpbnRlbF9jcnRjKTsKIAogCVdBUk5fT04oZHJtX2NydGNfaW5kZXgo JmludGVsX2NydGMtPmJhc2UpICE9IGludGVsX2NydGMtPnBpcGUpOwotLSAKMi4yMy4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=