From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [RFC PATCH 5/5] drm/atomic: Make async plane update checks work as intended. Date: Wed, 30 Aug 2017 14:17:52 +0200 Message-ID: <20170830121752.31291-6-maarten.lankhorst@linux.intel.com> References: <20170830121752.31291-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170830121752.31291-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: dri-devel@lists.freedesktop.org Cc: Gustavo Padovan , intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QnkgYWx3YXlzIGtlZXBpbmcgdHJhY2sgb2YgdGhlIGxhc3QgY29tbWl0IGluIHBsYW5lX3N0YXRl LCB3ZSBrbm93CndoZXRoZXIgdGhlcmUgaXMgYW4gYWN0aXZlIHVwZGF0ZSBvbiB0aGUgcGxhbmUg b3Igbm90LiBXaXRoIHRoYXQKaW5mb3JtYXRpb24gd2UgY2FuIHJlamVjdCB0aGUgZmFzdCB1cGRh dGUsIGFuZCBmb3JjZSB0aGUgc2xvd3BhdGgKdG8gYmUgdXNlZCBhcyB3YXMgb3JpZ2luYWxseSBp bnRlbmRlZC4KCkNjOiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJvcmEu Y29tPgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5j ICB8IDI1ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8ICA4ICsrKysrKysrCiBpbmNsdWRlL2RybS9kcm1fcGxhbmUuaCAgICAg ICAgICAgICAgfCAgNSArKystLQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAx NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDAzNGY1 NjNmYjEzMC4uMzg0ZDk5MzQ3YmIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpA QCAtMTM4OCw4ICsxMzg4LDggQEAgaW50IGRybV9hdG9taWNfaGVscGVyX2FzeW5jX2NoZWNrKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCXN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpfX3BsYW5l LCAqcGxhbmUgPSBOVUxMOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKl9fcGxhbmVfc3RhdGUs ICpwbGFuZV9zdGF0ZSA9IE5VTEw7CisJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CisJc3RydWN0 IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLCAqbmV3X3BsYW5lX3N0YXRlOwogCWNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzICpmdW5jczsKIAlpbnQgaSwgbl9wbGFu ZXMgPSAwOwogCkBAIC0xMzk4LDMzICsxMzk4LDMzIEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9h c3luY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJcmV0dXJuIC1FSU5WQUw7CiAJ fQogCi0JZm9yX2VhY2hfbmV3X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBfX3BsYW5lLCBfX3BsYW5l X3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfb2xkbmV3X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFu ZSwgb2xkX3BsYW5lX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUsIGkpCiAJCW5fcGxhbmVzKys7Ci0J CXBsYW5lID0gX19wbGFuZTsKLQkJcGxhbmVfc3RhdGUgPSBfX3BsYW5lX3N0YXRlOwotCX0KIAog CS8qIEZJWE1FOiB3ZSBzdXBwb3J0IG9ubHkgc2luZ2xlIHBsYW5lIHVwZGF0ZXMgZm9yIG5vdyAq LwotCWlmICghcGxhbmUgfHwgbl9wbGFuZXMgIT0gMSkKKwlpZiAobl9wbGFuZXMgIT0gMSkKIAkJ cmV0dXJuIC1FSU5WQUw7CiAKLQlpZiAoIXBsYW5lX3N0YXRlLT5jcnRjKQorCWlmICghbmV3X3Bs YW5lX3N0YXRlLT5jcnRjKQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCWZ1bmNzID0gcGxhbmUtPmhl bHBlcl9wcml2YXRlOwogCWlmICghZnVuY3MtPmF0b21pY19hc3luY191cGRhdGUpCiAJCXJldHVy biAtRUlOVkFMOwogCi0JaWYgKHBsYW5lX3N0YXRlLT5mZW5jZSkKKwlpZiAobmV3X3BsYW5lX3N0 YXRlLT5mZW5jZSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAkvKgotCSAqIFRPRE86IERvbid0IGRv IGFuIGFzeW5jIHVwZGF0ZSBpZiB0aGVyZSBpcyBhbiBvdXRzdGFuZGluZyBjb21taXQgbW9kaWZ5 aW5nCisJICogRG9uJ3QgZG8gYW4gYXN5bmMgdXBkYXRlIGlmIHRoZXJlIGlzIGFuIG91dHN0YW5k aW5nIGNvbW1pdCBtb2RpZnlpbmcKIAkgKiB0aGUgcGxhbmUuICBUaGlzIHByZXZlbnRzIG91ciBh c3luYyB1cGRhdGUncyBjaGFuZ2VzIGZyb20gZ2V0dGluZwogCSAqIG92ZXJyaWRkZW4gYnkgYSBw cmV2aW91cyBzeW5jaHJvbm91cyB1cGRhdGUncyBzdGF0ZS4KIAkgKi8KKwlpZiAob2xkX3BsYW5l X3N0YXRlLT5jb21taXQgJiYKKwkgICAgIXRyeV93YWl0X2Zvcl9jb21wbGV0aW9uKCZvbGRfcGxh bmVfc3RhdGUtPmNvbW1pdC0+aHdfZG9uZSkpCisJCXJldHVybiAtRUJVU1k7CiAKLQlyZXR1cm4g ZnVuY3MtPmF0b21pY19hc3luY19jaGVjayhwbGFuZSwgcGxhbmVfc3RhdGUpOworCXJldHVybiBm dW5jcy0+YXRvbWljX2FzeW5jX2NoZWNrKHBsYW5lLCBuZXdfcGxhbmVfc3RhdGUpOwogfQogRVhQ T1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9hc3luY19jaGVjayk7CiAKQEAgLTE3OTAsOSAr MTc5MCw2IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9zZXR1cF9jb21taXQoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlLAogCX0KIAogCWZvcl9lYWNoX29sZG5ld19wbGFuZV9pbl9zdGF0 ZShzdGF0ZSwgcGxhbmUsIG9sZF9wbGFuZV9zdGF0ZSwgbmV3X3BsYW5lX3N0YXRlLCBpKSB7Ci0J CWlmIChuZXdfcGxhbmVfc3RhdGUtPmNydGMpCi0JCQljb250aW51ZTsKLQogCQlpZiAobm9uYmxv Y2sgJiYgb2xkX3BsYW5lX3N0YXRlLT5jb21taXQgJiYKIAkJICAgICF0cnlfd2FpdF9mb3JfY29t cGxldGlvbigmb2xkX3BsYW5lX3N0YXRlLT5jb21taXQtPmZsaXBfZG9uZSkpCiAJCQlyZXR1cm4g LUVCVVNZOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDcwY2UwMjc1MzE3 Ny4uY2YyMWVjNGNlOTIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x MzA0Myw2ICsxMzA0MywxNCBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAkJZ290byBzbG93OwogCiAJb2xkX3BsYW5lX3N0YXRlID0gcGxhbmUt PnN0YXRlOworCS8qCisJICogRG9uJ3QgZG8gYW4gYXN5bmMgdXBkYXRlIGlmIHRoZXJlIGlzIGFu IG91dHN0YW5kaW5nIGNvbW1pdCBtb2RpZnlpbmcKKwkgKiB0aGUgcGxhbmUuICBUaGlzIHByZXZl bnRzIG91ciBhc3luYyB1cGRhdGUncyBjaGFuZ2VzIGZyb20gZ2V0dGluZworCSAqIG92ZXJyaWRk ZW4gYnkgYSBwcmV2aW91cyBzeW5jaHJvbm91cyB1cGRhdGUncyBzdGF0ZS4KKwkgKi8KKwlpZiAo b2xkX3BsYW5lX3N0YXRlLT5jb21taXQgJiYKKwkgICAgIXRyeV93YWl0X2Zvcl9jb21wbGV0aW9u KCZvbGRfcGxhbmVfc3RhdGUtPmNvbW1pdC0+aHdfZG9uZSkpCisJCWdvdG8gc2xvdzsKIAogCS8q CiAJICogSWYgYW55IHBhcmFtZXRlcnMgY2hhbmdlIHRoYXQgbWF5IGFmZmVjdCB3YXRlcm1hcmtz LApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX3BsYW5lLmggYi9pbmNsdWRlL2RybS9kcm1f cGxhbmUuaAppbmRleCA3ZDk2MTE2ZmQ0YzQuLmZlYjk5NDFkMGNkYiAxMDA2NDQKLS0tIGEvaW5j bHVkZS9kcm0vZHJtX3BsYW5lLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX3BsYW5lLmgKQEAgLTEy NCw5ICsxMjQsMTAgQEAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSB7CiAJYm9vbCB2aXNpYmxlOwog CiAJLyoqCi0JICogQGNvbW1pdDogVHJhY2tzIHRoZSBwZW5kaW5nIGNvbW1pdCB0byBwcmV2ZW50 IHVzZS1hZnRlci1mcmVlIGNvbmRpdGlvbnMuCisJICogQGNvbW1pdDogVHJhY2tzIHRoZSBwZW5k aW5nIGNvbW1pdCB0byBwcmV2ZW50IHVzZS1hZnRlci1mcmVlIGNvbmRpdGlvbnMsCisJICogYW5k IGZvciBhc3luYyBwbGFuZSB1cGRhdGVzLgogCSAqCi0JICogSXMgb25seSBzZXQgd2hlbiBAY3J0 YyBpcyBOVUxMLgorCSAqIE1heSBiZSBOVUxMLgogCSAqLwogCXN0cnVjdCBkcm1fY3J0Y19jb21t aXQgKmNvbW1pdDsKIAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK