From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 1/2] drm/atomic: move waiting for hw_done to a helper Date: Wed, 14 Jun 2017 11:08:41 +0200 Message-ID: <20170614090842.9669-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TW92aW5nIHRoZSB3YWl0IHRvIGEgaGVscGVyIGFsbG93cyBjYWxsZXJzIG91dHNpZGUgb2YgdGhl IGNvcmUgdG8Kd2FpdCBmb3IgcGVuZGluZyB1cGRhdGVzIHRvIGNvbXBsZXRlLgoKVGhpcyBjYW4g YmUgdXNlZCB0byBwcmV2ZW50IHJhY2VzIGFnYWluc3Qgbm9uYmxvY2tpbmcgbW9kZXNldHMuCk9u bHkgdGhlIGh3X2RvbmUgY2FsbCBpbiBzd2FwX3N0YXRlIGlzIG1vdmVkIHRvIGEgaGVscGVyLCBk b2luZwppdCBmb3IgdGhlIG90aGVyIGNhbGxlcnMgcmVxdWlyZXMgdG9vIG1hbnkgY2hhbmdlcyBh bmQgSSB0aGluayB0aGlzCmlzIHRoZSBvbmx5IHVzZWZ1bCBvbmUgdG8gZXhwb3J0LgoKU2lnbmVk LW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDUxICsrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGluY2x1ZGUvZHJtL2RybV9hdG9taWNf aGVscGVyLmggICAgIHwgIDEgKwogMiBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25zKCspLCAx NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDg2ZDMw OTNjNmM5Yi4uMWIwNjhjZTFhZWE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpA QCAtMjA2Nyw2ICsyMDY3LDQxIEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY2xlYW51cF9wbGFu ZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxw ZXJfY2xlYW51cF9wbGFuZXMpOwogCiAvKioKKyAqIGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9y X2h3X2RvbmUgLSB3YWl0IGZvciBhbGwgcHJldmlvdXMgaHcgdXBkYXRlcyB0byBjb21wbGV0ZS4K KyAqIEBjcnRjOiBjcnRjIHRvIHdhaXQgb24uCisgKgorICogVGhpcyBmdW5jdGlvbiB3YWl0cyBm b3IgYWxsIHByZXZpb3VzIGhhcmR3YXJlIHVwZGF0ZXMgcXVldWVkIG9uIEBjcnRjCisgKiB0byBj b21wbGV0ZS4KKyAqCisgKiBSZXR1cm5zOgorICogMCBvbiBzdWNjZXNzLCBuZWdhdGl2ZSBlcnJv ciBjb2RlIG9uIGZhaWx1cmUuCisgKi8KK2ludCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9o d19kb25lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0 ICpjb21taXQ7CisJbG9uZyByZXQ7CisKKwlzcGluX2xvY2soJmNydGMtPmNvbW1pdF9sb2NrKTsK Kwljb21taXQgPSBsaXN0X2ZpcnN0X2VudHJ5X29yX251bGwoJmNydGMtPmNvbW1pdF9saXN0LAor CQkJc3RydWN0IGRybV9jcnRjX2NvbW1pdCwgY29tbWl0X2VudHJ5KTsKKwlpZiAoY29tbWl0KQor CQlkcm1fY3J0Y19jb21taXRfZ2V0KGNvbW1pdCk7CisJc3Bpbl91bmxvY2soJmNydGMtPmNvbW1p dF9sb2NrKTsKKworCWlmICghY29tbWl0KQorCQlyZXR1cm4gMDsKKworCXJldCA9IHdhaXRfZm9y X2NvbXBsZXRpb25fdGltZW91dCgmY29tbWl0LT5od19kb25lLCAxMCAqIEhaKTsKKwlkcm1fY3J0 Y19jb21taXRfcHV0KGNvbW1pdCk7CisKKwlpZiAocmV0ID09IDApCisJCXJldHVybiAtRUJVU1k7 CisKKwlyZXR1cm4gcmV0ID4gMCA/IDAgOiByZXQ7Cit9CitFWFBPUlRfU1lNQk9MKGRybV9hdG9t aWNfaGVscGVyX3dhaXRfZm9yX2h3X2RvbmUpOworCisvKioKICAqIGRybV9hdG9taWNfaGVscGVy X3N3YXBfc3RhdGUgLSBzdG9yZSBhdG9taWMgc3RhdGUgaW50byBjdXJyZW50IHN3IHN0YXRlCiAg KiBAc3RhdGU6IGF0b21pYyBzdGF0ZQogICogQHN0YWxsOiBzdGFsbCBmb3IgcHJvY2VlZGluZyBj b21taXRzCkBAIC0yMTA3LDI4ICsyMTQyLDE2IEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfc3dh cF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGRybV9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lOwogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwgKm5l d19wbGFuZV9zdGF0ZTsKLQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7CiAJdm9pZCAq b2JqLCAqb2JqX3N0YXRlOwogCWNvbnN0IHN0cnVjdCBkcm1fcHJpdmF0ZV9zdGF0ZV9mdW5jcyAq ZnVuY3M7CiAKIAlpZiAoc3RhbGwpIHsKIAkJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3Rh dGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0JCQlzcGluX2xvY2soJmNydGMtPmNvbW1p dF9sb2NrKTsKLQkJCWNvbW1pdCA9IGxpc3RfZmlyc3RfZW50cnlfb3JfbnVsbCgmY3J0Yy0+Y29t bWl0X2xpc3QsCi0JCQkJCXN0cnVjdCBkcm1fY3J0Y19jb21taXQsIGNvbW1pdF9lbnRyeSk7Ci0J CQlpZiAoY29tbWl0KQotCQkJCWRybV9jcnRjX2NvbW1pdF9nZXQoY29tbWl0KTsKLQkJCXNwaW5f dW5sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7CisJCQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl93 YWl0X2Zvcl9od19kb25lKGNydGMpOwogCi0JCQlpZiAoIWNvbW1pdCkKLQkJCQljb250aW51ZTsK LQotCQkJcmV0ID0gd2FpdF9mb3JfY29tcGxldGlvbl90aW1lb3V0KCZjb21taXQtPmh3X2RvbmUs Ci0JCQkJCQkJICAxMCpIWik7Ci0JCQlpZiAocmV0ID09IDApCisJCQlpZiAocmV0IDwgMCkKIAkJ CQlEUk1fRVJST1IoIltDUlRDOiVkOiVzXSBod19kb25lIHRpbWVkIG91dFxuIiwKIAkJCQkJICBj cnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKLQkJCWRybV9jcnRjX2NvbW1pdF9wdXQoY29tbWl0 KTsKIAkJfQogCX0KIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIu aCBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgKaW5kZXggZjBhODY3OGFlOThlLi4x NzVhMWEzZmVkMzYgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgK KysrIGIvaW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIuaApAQCAtNzcsNiArNzcsNyBAQCB2 b2lkCiBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lc19vbl9jcnRjKHN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCQkJCSBib29sIGF0b21pYyk7CiAKK2ludCBk cm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9od19kb25lKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7 CiB2b2lkIGRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAogCQkJCSAgYm9vbCBzdGFsbCk7CiAKLS0gCjIuMTEuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==