From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 1/3] Consolidate amdgpu_scanout_flip_abort/handler helpers Date: Fri, 18 Aug 2017 17:55:01 +0900 Message-ID: <20170818085503.3908-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpXaGlsZSBhdCBp dCwgbWFrZSB0aGVtIHVzZSBjcnRjLT5kcml2ZXJfcHJpdmF0ZS4KCihQb3J0ZWQgZnJvbSByYWRl b24gY29tbWl0IDM2Y2U3OTIwMTM2YzBkNzIzYzkzOTdhODRlN2RkNTkyNmE5Yzc5NDMpCgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgRMOkbnplciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCiBz cmMvYW1kZ3B1X2ttcy5jIHwgODUgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA0 OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYW1kZ3B1X2ttcy5jIGIvc3JjL2FtZGdw dV9rbXMuYwppbmRleCBiMGYxYTNkOTQuLmY2NjVhMDFjZCAxMDA2NDQKLS0tIGEvc3JjL2FtZGdw dV9rbXMuYworKysgYi9zcmMvYW1kZ3B1X2ttcy5jCkBAIC00MjAsNiArNDIwLDM4IEBAIGFtZGdw dV9zeW5jX3NjYW5vdXRfcGl4bWFwcyh4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMsIFJlZ2lvblB0ciBu ZXdfcmVnaW9uLAogCVJlZ2lvblVuaW5pdCgmcmVtYWluaW5nKTsKIH0KIAorc3RhdGljIHZvaWQK K2FtZGdwdV9zY2Fub3V0X2ZsaXBfYWJvcnQoeGY4NkNydGNQdHIgY3J0Yywgdm9pZCAqZXZlbnRf ZGF0YSkKK3sKKwlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYoY3J0Yy0+ c2Nybik7CisJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9IGNydGMtPmRy aXZlcl9wcml2YXRlOworCisJZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nID0g RkFMU0U7CisJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlX2Ny dGMtPmZsaXBfcGVuZGluZywKKwkJCSAgICAgTlVMTCk7Cit9CisKK3N0YXRpYyB2b2lkCithbWRn cHVfc2Nhbm91dF9mbGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgbXNjLCB1 aW50NjRfdCB1c2VjLAorCQkJICAgIHZvaWQgKmV2ZW50X2RhdGEpCit7CisJQU1ER1BVRW50UHRy IHBBTURHUFVFbnQgPSBBTURHUFVFbnRQcml2KGNydGMtPnNjcm4pOworCWRybW1vZGVfY3J0Y19w cml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKKworCWRybW1v ZGVfZmJfcmVmZXJlbmNlKHBBTURHUFVFbnQtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwKKwkJCSAg ICAgZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcpOworCWFtZGdwdV9zY2Fub3V0X2ZsaXBfYWJv cnQoY3J0YywgZXZlbnRfZGF0YSk7CisKKyNpZmRlZiBIQVZFX1BSRVNFTlRfSAorCWlmIChkcm1t b2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkKSB7CisJCXByZXNlbnRfZXZlbnRfbm90 aWZ5KGRybW1vZGVfY3J0Yy0+cHJlc2VudF92YmxhbmtfZXZlbnRfaWQsCisJCQkJICAgICBkcm1t b2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX3VzZWMsCisJCQkJICAgICBkcm1tb2RlX2NydGMtPnBy ZXNlbnRfdmJsYW5rX21zYyk7CisJCWRybW1vZGVfY3J0Yy0+cHJlc2VudF92YmxhbmtfZXZlbnRf aWQgPSAwOworCX0KKyNlbmRpZgorfQorCiAjaWZkZWYgQU1ER1BVX1BJWE1BUF9TSEFSSU5HCiAK IHN0YXRpYyBSZWdpb25QdHIKQEAgLTY2NCwzOCArNjk2LDYgQEAgYW1kZ3B1X3ByaW1lX3NjYW5v dXRfdXBkYXRlKFBpeG1hcERpcnR5VXBkYXRlUHRyIGRpcnR5KQogCWRybW1vZGVfY3J0Yy0+c2Nh bm91dF91cGRhdGVfcGVuZGluZyA9IFRSVUU7CiB9CiAKLXN0YXRpYyB2b2lkCi1hbWRncHVfcHJp bWVfc2Nhbm91dF9mbGlwX2Fib3J0KHhmODZDcnRjUHRyIGNydGMsIHZvaWQgKmV2ZW50X2RhdGEp Ci17Ci0JQU1ER1BVRW50UHRyIHBBTURHUFVFbnQgPSBBTURHUFVFbnRQcml2KGNydGMtPnNjcm4p OwotCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBldmVudF9kYXRhOwot Ci0JZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nID0gRkFMU0U7Ci0JZHJtbW9k ZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGlu ZywKLQkJCSAgICAgTlVMTCk7Ci19Ci0KLXN0YXRpYyB2b2lkCi1hbWRncHVfcHJpbWVfc2Nhbm91 dF9mbGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3QgbXNjLCB1aW50NjRfdCB1 c2VjLAotCQkJCSAgdm9pZCAqZXZlbnRfZGF0YSkKLXsKLQlBTURHUFVFbnRQdHIgcEFNREdQVUVu dCA9IEFNREdQVUVudFByaXYoY3J0Yy0+c2Nybik7Ci0JZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRy IGRybW1vZGVfY3J0YyA9IGV2ZW50X2RhdGE7Ci0KLQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwQU1E R1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCi0JCQkgICAgIGRybW1vZGVfY3J0Yy0+Zmxp cF9wZW5kaW5nKTsKLQlhbWRncHVfcHJpbWVfc2Nhbm91dF9mbGlwX2Fib3J0KGNydGMsIGV2ZW50 X2RhdGEpOwotCi0jaWZkZWYgSEFWRV9QUkVTRU5UX0gKLQlpZiAoZHJtbW9kZV9jcnRjLT5wcmVz ZW50X3ZibGFua19ldmVudF9pZCkgewotCQlwcmVzZW50X2V2ZW50X25vdGlmeShkcm1tb2RlX2Ny dGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkLAotCQkJCSAgICAgZHJtbW9kZV9jcnRjLT5wcmVz ZW50X3ZibGFua191c2VjLAotCQkJCSAgICAgZHJtbW9kZV9jcnRjLT5wcmVzZW50X3ZibGFua19t c2MpOwotCQlkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkID0gMDsKLQl9Ci0j ZW5kaWYKLX0KLQogc3RhdGljIHZvaWQKIGFtZGdwdV9wcmltZV9zY2Fub3V0X2ZsaXAoUGl4bWFw RGlydHlVcGRhdGVQdHIgZW50KQogewpAQCAtNzIzLDkgKzcyMyw5IEBAIGFtZGdwdV9wcmltZV9z Y2Fub3V0X2ZsaXAoUGl4bWFwRGlydHlVcGRhdGVQdHIgZW50KQogCWRybV9xdWV1ZV9zZXEgPSBh bWRncHVfZHJtX3F1ZXVlX2FsbG9jKGNydGMsCiAJCQkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVF X0NMSUVOVF9ERUZBVUxULAogCQkJCQkgICAgICAgQU1ER1BVX0RSTV9RVUVVRV9JRF9ERUZBVUxU LAotCQkJCQkgICAgICAgZHJtbW9kZV9jcnRjLAotCQkJCQkgICAgICAgYW1kZ3B1X3ByaW1lX3Nj YW5vdXRfZmxpcF9oYW5kbGVyLAotCQkJCQkgICAgICAgYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxp cF9hYm9ydCk7CisJCQkJCSAgICAgICBOVUxMLAorCQkJCQkgICAgICAgYW1kZ3B1X3NjYW5vdXRf ZmxpcF9oYW5kbGVyLAorCQkJCQkgICAgICAgYW1kZ3B1X3NjYW5vdXRfZmxpcF9hYm9ydCk7CiAJ aWYgKGRybV9xdWV1ZV9zZXEgPT0gQU1ER1BVX0RSTV9RVUVVRV9FUlJPUikgewogCQl4Zjg2RHJ2 TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLAogCQkJICAgIkFsbG9jYXRpbmcgRFJNIGV2 ZW50IHF1ZXVlIGVudHJ5IGZhaWxlZCBmb3IgUFJJTUUgZmxpcC5cbiIpOwpAQCAtOTc1LDE5ICs5 NzUsNiBAQCBhbWRncHVfc2Nhbm91dF91cGRhdGUoeGY4NkNydGNQdHIgeGY4Nl9jcnRjKQogCWRy bW1vZGVfY3J0Yy0+c2Nhbm91dF91cGRhdGVfcGVuZGluZyA9IFRSVUU7CiB9CiAKLXN0YXRpYyB2 b2lkCi1hbWRncHVfc2Nhbm91dF9mbGlwX2Fib3J0KHhmODZDcnRjUHRyIGNydGMsIHZvaWQgKmV2 ZW50X2RhdGEpCi17Ci0JYW1kZ3B1X3ByaW1lX3NjYW5vdXRfZmxpcF9hYm9ydChjcnRjLCBldmVu dF9kYXRhKTsKLX0KLQotc3RhdGljIHZvaWQKLWFtZGdwdV9zY2Fub3V0X2ZsaXBfaGFuZGxlcih4 Zjg2Q3J0Y1B0ciBjcnRjLCB1aW50MzJfdCBtc2MsIHVpbnQ2NF90IHVzZWMsCi0JCQkgICAgdm9p ZCAqZXZlbnRfZGF0YSkKLXsKLQlhbWRncHVfcHJpbWVfc2Nhbm91dF9mbGlwX2hhbmRsZXIoY3J0 YywgbXNjLCB1c2VjLCBldmVudF9kYXRhKTsKLX0KLQogc3RhdGljIHZvaWQKIGFtZGdwdV9zY2Fu b3V0X2ZsaXAoU2NyZWVuUHRyIHBTY3JlZW4sIEFNREdQVUluZm9QdHIgaW5mbywKIAkJCQkJeGY4 NkNydGNQdHIgeGY4Nl9jcnRjKQpAQCAtMTAxNCw3ICsxMDAxLDcgQEAgYW1kZ3B1X3NjYW5vdXRf ZmxpcChTY3JlZW5QdHIgcFNjcmVlbiwgQU1ER1BVSW5mb1B0ciBpbmZvLAogCWRybV9xdWV1ZV9z ZXEgPSBhbWRncHVfZHJtX3F1ZXVlX2FsbG9jKHhmODZfY3J0YywKIAkJCQkJICAgICAgIEFNREdQ VV9EUk1fUVVFVUVfQ0xJRU5UX0RFRkFVTFQsCiAJCQkJCSAgICAgICBBTURHUFVfRFJNX1FVRVVF X0lEX0RFRkFVTFQsCi0JCQkJCSAgICAgICBkcm1tb2RlX2NydGMsCisJCQkJCSAgICAgICBOVUxM LAogCQkJCQkgICAgICAgYW1kZ3B1X3NjYW5vdXRfZmxpcF9oYW5kbGVyLAogCQkJCQkgICAgICAg YW1kZ3B1X3NjYW5vdXRfZmxpcF9hYm9ydCk7CiAJaWYgKGRybV9xdWV1ZV9zZXEgPT0gQU1ER1BV X0RSTV9RVUVVRV9FUlJPUikgewotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZngK