From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati] Consolidate radeon_scanout_flip_abort/handler helpers Date: Wed, 16 Aug 2017 18:35:34 +0900 Message-ID: <20170816093534.11341-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 dCwgbWFrZSB0aGVtIHVzZSBjcnRjLT5kcml2ZXJfcHJpdmF0ZS4KClNpZ25lZC1vZmYtYnk6IE1p Y2hlbCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIHNyYy9yYWRlb25fa21z LmMgfCA4NSArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDQ5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fa21zLmMgYi9zcmMvcmFkZW9uX2ttcy5jCmluZGV4 IDdmZWJmMTQ4Ny4uNGMwMDFhMzFmIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2ttcy5jCisrKyBi L3NyYy9yYWRlb25fa21zLmMKQEAgLTUxOCw2ICs1MTgsMzggQEAgcmFkZW9uX3N5bmNfc2Nhbm91 dF9waXhtYXBzKHhmODZDcnRjUHRyIHhmODZfY3J0YywgUmVnaW9uUHRyIG5ld19yZWdpb24sCiAg ICAgUmVnaW9uVW5pbml0KCZyZW1haW5pbmcpOwogfQogCitzdGF0aWMgdm9pZAorcmFkZW9uX3Nj YW5vdXRfZmxpcF9hYm9ydCh4Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpldmVudF9kYXRhKQorewor ICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihjcnRjLT5zY3JuKTsK KyAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVy X3ByaXZhdGU7CisKKyAgICBkcm1tb2RlX2NydGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcgPSBG QUxTRTsKKyAgICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShwUkFERU9ORW50LT5mZCwgJmRybW1vZGVf Y3J0Yy0+ZmxpcF9wZW5kaW5nLAorCQkJIE5VTEwpOworfQorCitzdGF0aWMgdm9pZAorcmFkZW9u X3NjYW5vdXRfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IG1zYywgdWlu dDY0X3QgdXNlYywKKwkJCQkgIHZvaWQgKmV2ZW50X2RhdGEpCit7CisgICAgUkFERU9ORW50UHRy IHBSQURFT05FbnQgPSBSQURFT05FbnRQcml2KGNydGMtPnNjcm4pOworICAgIGRybW1vZGVfY3J0 Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKKworICAg IGRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmZHJtbW9kZV9jcnRjLT5mYiwK KwkJCSBkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZyk7CisgICAgcmFkZW9uX3NjYW5vdXRfZmxp cF9hYm9ydChjcnRjLCBldmVudF9kYXRhKTsKKworI2lmZGVmIEhBVkVfUFJFU0VOVF9ICisgICAg aWYgKGRybW1vZGVfY3J0Yy0+cHJlc2VudF92YmxhbmtfZXZlbnRfaWQpIHsKKwlwcmVzZW50X2V2 ZW50X25vdGlmeShkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkLAorCQkJICAg ICBkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX3VzZWMsCisJCQkgICAgIGRybW1vZGVfY3J0 Yy0+cHJlc2VudF92YmxhbmtfbXNjKTsKKwlkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2 ZW50X2lkID0gMDsKKyAgICB9CisjZW5kaWYKK30KKwogI2lmZGVmIFJBREVPTl9QSVhNQVBfU0hB UklORwogCiBzdGF0aWMgUmVnaW9uUHRyCkBAIC03NjIsMzggKzc5NCw2IEBAIHJhZGVvbl9wcmlt ZV9zY2Fub3V0X3VwZGF0ZShQaXhtYXBEaXJ0eVVwZGF0ZVB0ciBkaXJ0eSkKICAgICBkcm1tb2Rl X2NydGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcgPSBUUlVFOwogfQogCi1zdGF0aWMgdm9pZAot cmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcF9hYm9ydCh4Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpl dmVudF9kYXRhKQotewotICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJp dihjcnRjLT5zY3JuKTsKLSAgICBkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRj ID0gZXZlbnRfZGF0YTsKLQotICAgIGRybW1vZGVfY3J0Yy0+c2Nhbm91dF91cGRhdGVfcGVuZGlu ZyA9IEZBTFNFOwotICAgIGRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmZHJt bW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcsCi0JCQkgTlVMTCk7Ci19Ci0KLXN0YXRpYyB2b2lkCi1y YWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwX2hhbmRsZXIoeGY4NkNydGNQdHIgY3J0YywgdWludDMy X3QgbXNjLCB1aW50NjRfdCB1c2VjLAotCQkJCSAgdm9pZCAqZXZlbnRfZGF0YSkKLXsKLSAgICBS QURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7Ci0gICAg ZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9IGV2ZW50X2RhdGE7Ci0KLSAg ICBkcm1tb2RlX2ZiX3JlZmVyZW5jZShwUkFERU9ORW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIs Ci0JCQkgZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcpOwotICAgIHJhZGVvbl9wcmltZV9zY2Fu b3V0X2ZsaXBfYWJvcnQoY3J0YywgZXZlbnRfZGF0YSk7Ci0KLSNpZmRlZiBIQVZFX1BSRVNFTlRf SAotICAgIGlmIChkcm1tb2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX2V2ZW50X2lkKSB7Ci0JcHJl c2VudF9ldmVudF9ub3RpZnkoZHJtbW9kZV9jcnRjLT5wcmVzZW50X3ZibGFua19ldmVudF9pZCwK LQkJCSAgICAgZHJtbW9kZV9jcnRjLT5wcmVzZW50X3ZibGFua191c2VjLAotCQkJICAgICBkcm1t b2RlX2NydGMtPnByZXNlbnRfdmJsYW5rX21zYyk7Ci0JZHJtbW9kZV9jcnRjLT5wcmVzZW50X3Zi bGFua19ldmVudF9pZCA9IDA7Ci0gICAgfQotI2VuZGlmCi19Ci0KIHN0YXRpYyB2b2lkCiByYWRl b25fcHJpbWVfc2Nhbm91dF9mbGlwKFBpeG1hcERpcnR5VXBkYXRlUHRyIGVudCkKIHsKQEAgLTgy MSw5ICs4MjEsOSBAQCByYWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwKFBpeG1hcERpcnR5VXBkYXRl UHRyIGVudCkKICAgICBkcm1fcXVldWVfc2VxID0gcmFkZW9uX2RybV9xdWV1ZV9hbGxvYyhjcnRj LAogCQkJCQkgICBSQURFT05fRFJNX1FVRVVFX0NMSUVOVF9ERUZBVUxULAogCQkJCQkgICBSQURF T05fRFJNX1FVRVVFX0lEX0RFRkFVTFQsCi0JCQkJCSAgIGRybW1vZGVfY3J0YywKLQkJCQkJICAg cmFkZW9uX3ByaW1lX3NjYW5vdXRfZmxpcF9oYW5kbGVyLAotCQkJCQkgICByYWRlb25fcHJpbWVf c2Nhbm91dF9mbGlwX2Fib3J0KTsKKwkJCQkJICAgTlVMTCwKKwkJCQkJICAgcmFkZW9uX3NjYW5v dXRfZmxpcF9oYW5kbGVyLAorCQkJCQkgICByYWRlb25fc2Nhbm91dF9mbGlwX2Fib3J0KTsKICAg ICBpZiAoZHJtX3F1ZXVlX3NlcSA9PSBSQURFT05fRFJNX1FVRVVFX0VSUk9SKSB7CiAJeGY4NkRy dk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywKIAkJICAgIkFsbG9jYXRpbmcgRFJNIGV2 ZW50IHF1ZXVlIGVudHJ5IGZhaWxlZCBmb3IgUFJJTUUgZmxpcC5cbiIpOwpAQCAtMTA4MSwxOSAr MTA4MSw2IEBAIHJhZGVvbl9zY2Fub3V0X3VwZGF0ZSh4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMpCiAg ICAgZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nID0gVFJVRTsKIH0KIAotc3Rh dGljIHZvaWQKLXJhZGVvbl9zY2Fub3V0X2ZsaXBfYWJvcnQoeGY4NkNydGNQdHIgY3J0Yywgdm9p ZCAqZXZlbnRfZGF0YSkKLXsKLSAgICByYWRlb25fcHJpbWVfc2Nhbm91dF9mbGlwX2Fib3J0KGNy dGMsIGV2ZW50X2RhdGEpOwotfQotCi1zdGF0aWMgdm9pZAotcmFkZW9uX3NjYW5vdXRfZmxpcF9o YW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IG1zYywgdWludDY0X3QgdXNlYywKLQkJ CSAgICB2b2lkICpldmVudF9kYXRhKQotewotICAgIHJhZGVvbl9wcmltZV9zY2Fub3V0X2ZsaXBf aGFuZGxlcihjcnRjLCBtc2MsIHVzZWMsIGV2ZW50X2RhdGEpOwotfQotCiBzdGF0aWMgdm9pZAog cmFkZW9uX3NjYW5vdXRfZmxpcChTY3JlZW5QdHIgcFNjcmVlbiwgUkFERU9OSW5mb1B0ciBpbmZv LAogCQkgICAgeGY4NkNydGNQdHIgeGY4Nl9jcnRjKQpAQCAtMTEyMCw3ICsxMTA3LDcgQEAgcmFk ZW9uX3NjYW5vdXRfZmxpcChTY3JlZW5QdHIgcFNjcmVlbiwgUkFERU9OSW5mb1B0ciBpbmZvLAog ICAgIGRybV9xdWV1ZV9zZXEgPSByYWRlb25fZHJtX3F1ZXVlX2FsbG9jKHhmODZfY3J0YywKIAkJ CQkJICAgUkFERU9OX0RSTV9RVUVVRV9DTElFTlRfREVGQVVMVCwKIAkJCQkJICAgUkFERU9OX0RS TV9RVUVVRV9JRF9ERUZBVUxULAotCQkJCQkgICBkcm1tb2RlX2NydGMsCisJCQkJCSAgIE5VTEws CiAJCQkJCSAgIHJhZGVvbl9zY2Fub3V0X2ZsaXBfaGFuZGxlciwKIAkJCQkJICAgcmFkZW9uX3Nj YW5vdXRfZmxpcF9hYm9ydCk7CiAgICAgaWYgKGRybV9xdWV1ZV9zZXEgPT0gUkFERU9OX0RSTV9R VUVVRV9FUlJPUikgewotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2FtZC1nZngK