From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 08/10] Refactor radeon_finish helper Date: Thu, 5 Jul 2018 14:13:05 +0200 Message-ID: <20180705121307.7835-9-michel@daenzer.net> References: <20180705121307.7835-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180705121307.7835-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org> 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+CgpTaWduZWQtb2Zm LWJ5OiBNaWNoZWwgRMOkbnplciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCiBzcmMvZHJt bW9kZV9kaXNwbGF5LmMgICAgICAgIHwgMTYgKysrLS0tLS0tLS0tLS0tLQogc3JjL3JhZGVvbi5o ICAgICAgICAgICAgICAgICB8ICAxICsKIHNyYy9yYWRlb25fYm9faGVscGVyLmMgICAgICAgfCAx MCArKysrKysrKysrCiBzcmMvcmFkZW9uX2JvX2hlbHBlci5oICAgICAgIHwgIDMgKysrCiBzcmMv cmFkZW9uX2dsYW1vcl93cmFwcGVycy5jIHwgMjEgKysrKysrKysrKy0tLS0tLS0tLS0tCiBzcmMv cmFkZW9uX2ttcy5jICAgICAgICAgICAgIHwgIDYgKystLS0tCiBzcmMvcmFkZW9uX3ByZXNlbnQu YyAgICAgICAgIHwgIDQgKy0tLQogNyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAz MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMgYi9zcmMv ZHJtbW9kZV9kaXNwbGF5LmMKaW5kZXggNTRiMDk3MzBkLi4zYzRkOTRmZDkgMTAwNjQ0Ci0tLSBh L3NyYy9kcm1tb2RlX2Rpc3BsYXkuYworKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKQEAgLTcy Niw4ICs3MjYsNyBAQCBkcm1tb2RlX2NydGNfcHJpbWVfc2Nhbm91dF91cGRhdGUoeGY4NkNydGNQ dHIgY3J0YywgRGlzcGxheU1vZGVQdHIgbW9kZSwKIAkJCQkJICBnYywgMCwgMCwgbW9kZS0+SERp c3BsYXksIG1vZGUtPlZEaXNwbGF5LAogCQkJCQkgIDAsIDApOwogCQkJRnJlZVNjcmF0Y2hHQyhn Yyk7Ci0JCQlyYWRlb25fY3NfZmx1c2hfaW5kaXJlY3Qoc2Nybik7Ci0JCQlyYWRlb25fYm9fd2Fp dChkcm1tb2RlX2NydGMtPnNjYW5vdXRbMF0uYm8pOworCQkJcmFkZW9uX2ZpbmlzaChzY3JuLCBk cm1tb2RlX2NydGMtPnNjYW5vdXRbMF0uYm8pOwogCQl9CiAJfQogCkBAIC03ODUsOCArNzg0LDcg QEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfdXBkYXRlKHhmODZDcnRjUHRyIGNydGMsIERpc3BsYXlN b2RlUHRyIG1vZGUsCiAJCXJhZGVvbl9zY2Fub3V0X2RvX3VwZGF0ZShjcnRjLCBzY2Fub3V0X2lk LAogCQkJCQkgc2NyZWVuLT5HZXRXaW5kb3dQaXhtYXAoc2NyZWVuLT5yb290KSwKIAkJCQkJICpi b3gpOwotCQlyYWRlb25fY3NfZmx1c2hfaW5kaXJlY3Qoc2Nybik7Ci0JCXJhZGVvbl9ib193YWl0 KGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5ibyk7CisJCXJhZGVvbl9maW5pc2go c2NybiwgZHJtbW9kZV9jcnRjLT5zY2Fub3V0W3NjYW5vdXRfaWRdLmJvKTsKIAl9CiB9CiAKQEAg LTIyNDAsNyArMjIzOCw2IEBAIGRybW1vZGVfeGY4NmNydGNfcmVzaXplIChTY3JuSW5mb1B0ciBz Y3JuLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAJaW50IGFsaWduZWRfaGVpZ2h0OwogCXVpbnQz Ml90IHNjcmVlbl9zaXplOwogCWludCBjcHAgPSBpbmZvLT5waXhlbF9ieXRlczsKLQlzdHJ1Y3Qg cmFkZW9uX2JvICpmcm9udF9ibzsKIAlzdHJ1Y3QgcmFkZW9uX3N1cmZhY2Ugc3VyZmFjZTsKIAl1 aW50MzJfdCB0aWxpbmdfZmxhZ3MgPSAwLCBiYXNlX2FsaWduOwogCVBpeG1hcFB0ciBwcGl4ID0g c2NyZWVuLT5HZXRTY3JlZW5QaXhtYXAoc2NyZWVuKTsKQEAgLTIyNDksMTIgKzIyNDYsNiBAQCBk cm1tb2RlX3hmODZjcnRjX3Jlc2l6ZSAoU2NybkluZm9QdHIgc2NybiwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0KQogCWlmIChzY3JuLT52aXJ0dWFsWCA9PSB3aWR0aCAmJiBzY3JuLT52aXJ0dWFsWSA9 PSBoZWlnaHQpCiAJCXJldHVybiBUUlVFOwogCi0JZnJvbnRfYm8gPSBpbmZvLT5mcm9udF9ibzsK LQlyYWRlb25fY3NfZmx1c2hfaW5kaXJlY3Qoc2Nybik7Ci0KLQlpZiAoZnJvbnRfYm8pCi0JCXJh ZGVvbl9ib193YWl0KGZyb250X2JvKTsKLQogCWlmIChpbmZvLT5hbGxvd0NvbG9yVGlsaW5nICYm ICFpbmZvLT5zaGFkb3dfcHJpbWFyeSkgewogCQlpZiAoaW5mby0+Q2hpcEZhbWlseSA+PSBDSElQ X0ZBTUlMWV9SNjAwKSB7CiAJCQlpZiAoaW5mby0+YWxsb3dDb2xvclRpbGluZzJEKSB7CkBAIC0y MzY0LDggKzIzNTUsNyBAQCBkcm1tb2RlX3hmODZjcnRjX3Jlc2l6ZSAoU2NybkluZm9QdHIgc2Ny biwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogCX0KIAogCXJhZGVvbl9waXhtYXBfY2xlYXIocHBp eCk7Ci0JcmFkZW9uX2NzX2ZsdXNoX2luZGlyZWN0KHNjcm4pOwotCXJhZGVvbl9ib193YWl0KGlu Zm8tPmZyb250X2JvKTsKKwlyYWRlb25fZmluaXNoKHNjcm4sIGluZm8tPmZyb250X2JvKTsKIAog CWZvciAoaSA9IDA7IGkgPCB4Zjg2X2NvbmZpZy0+bnVtX2NydGM7IGkrKykgewogCQl4Zjg2Q3J0 Y1B0ciBjcnRjID0geGY4Nl9jb25maWctPmNydGNbaV07CmRpZmYgLS1naXQgYS9zcmMvcmFkZW9u LmggYi9zcmMvcmFkZW9uLmgKaW5kZXggYzJhZTY2MDZlLi40OTllODlmOTIgMTAwNjQ0Ci0tLSBh L3NyYy9yYWRlb24uaAorKysgYi9zcmMvcmFkZW9uLmgKQEAgLTg5NSw2ICs4OTUsNyBAQCByYWRl b25fcGl4bWFwX2dldF9mYihQaXhtYXBQdHIgcGl4KQogICAgIHJldHVybiAqZmJfcHRyOwogfQog CisKICNkZWZpbmUgQ1BfUEFDS0VUMChyZWcsIG4pCQkJCQkJXAogCShSQURFT05fQ1BfUEFDS0VU MCB8ICgobikgPDwgMTYpIHwgKChyZWcpID4+IDIpKQogI2RlZmluZSBDUF9QQUNLRVQxKHJlZzAs IHJlZzEpCQkJCQkJXApkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbl9ib19oZWxwZXIuYyBiL3NyYy9y YWRlb25fYm9faGVscGVyLmMKaW5kZXggMzc2NTg5NDI3Li43Y2ZlOTEyNjUgMTAwNjQ0Ci0tLSBh L3NyYy9yYWRlb25fYm9faGVscGVyLmMKKysrIGIvc3JjL3JhZGVvbl9ib19oZWxwZXIuYwpAQCAt MjM1LDYgKzIzNSwxNiBAQCByYWRlb25fYWxsb2NfcGl4bWFwX2JvKFNjcm5JbmZvUHRyIHBTY3Ju LCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIGludCBkZXB0aCwKICAgICByZXR1cm4gYm87CiB9CiAK KworLyogRmx1c2ggYW5kIHdhaXQgZm9yIHRoZSBCTyB0byBiZWNvbWUgaWRsZSAqLwordm9pZAor cmFkZW9uX2ZpbmlzaChTY3JuSW5mb1B0ciBzY3JuLCBzdHJ1Y3QgcmFkZW9uX2JvICpibykKK3sK KyAgICByYWRlb25fY3NfZmx1c2hfaW5kaXJlY3Qoc2Nybik7CisgICAgcmFkZW9uX2JvX3dhaXQo Ym8pOworfQorCisKIC8qIENsZWFyIHRoZSBwaXhtYXAgY29udGVudHMgdG8gYmxhY2sgKi8KIHZv aWQKIHJhZGVvbl9waXhtYXBfY2xlYXIoUGl4bWFwUHRyIHBpeG1hcCkKZGlmZiAtLWdpdCBhL3Ny Yy9yYWRlb25fYm9faGVscGVyLmggYi9zcmMvcmFkZW9uX2JvX2hlbHBlci5oCmluZGV4IGUxODU2 YWRiMS4uZmE5OTIwMWIyIDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2JvX2hlbHBlci5oCisrKyBi L3NyYy9yYWRlb25fYm9faGVscGVyLmgKQEAgLTI4LDYgKzI4LDkgQEAgcmFkZW9uX2FsbG9jX3Bp eG1hcF9ibyhTY3JuSW5mb1B0ciBwU2NybiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBpbnQgZGVw dGgsCiAJCSAgICAgICBpbnQgdXNhZ2VfaGludCwgaW50IGJpdHNQZXJQaXhlbCwgaW50ICpuZXdf cGl0Y2gsCiAJCSAgICAgICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2UgKm5ld19zdXJmYWNlLCB1aW50 MzJfdCAqbmV3X3RpbGluZyk7CiAKK2V4dGVybiB2b2lkCityYWRlb25fZmluaXNoKFNjcm5JbmZv UHRyIHNjcm4sIHN0cnVjdCByYWRlb25fYm8gKmJvKTsKKwogZXh0ZXJuIHZvaWQKIHJhZGVvbl9w aXhtYXBfY2xlYXIoUGl4bWFwUHRyIHBpeG1hcCk7CiAKZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25f Z2xhbW9yX3dyYXBwZXJzLmMgYi9zcmMvcmFkZW9uX2dsYW1vcl93cmFwcGVycy5jCmluZGV4IGQ3 Mzc0MjUyOC4uOTQ3MDBhN2I5IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2dsYW1vcl93cmFwcGVy cy5jCisrKyBiL3NyYy9yYWRlb25fZ2xhbW9yX3dyYXBwZXJzLmMKQEAgLTU4LDEzICs1OCwxMyBA QCByYWRlb25fZ2xhbW9yX3ByZXBhcmVfYWNjZXNzX2NwdShTY3JuSW5mb1B0ciBzY3JuLCBSQURF T05JbmZvUHRyIGluZm8sCiAJc3RydWN0IHJhZGVvbl9ibyAqYm8gPSBwcml2LT5ibzsKIAlpbnQg cmV0OwogCi0JLyogV2hlbiBmYWxsaW5nIGJhY2sgdG8gc3dyYXN0LCBmbHVzaCBhbGwgcGVuZGlu ZyBvcGVyYXRpb25zICovCi0JaWYgKG5lZWRfc3luYykgewotCQlnbGFtb3JfYmxvY2tfaGFuZGxl cihzY3JuLT5wU2NyZWVuKTsKLQkJaW5mby0+Z3B1X2ZsdXNoZWQrKzsKLQl9Ci0KIAlpZiAoIXBp eG1hcC0+ZGV2UHJpdmF0ZS5wdHIpIHsKKwkJLyogV2hlbiBmYWxsaW5nIGJhY2sgdG8gc3dyYXN0 LCBmbHVzaCBhbGwgcGVuZGluZyBvcGVyYXRpb25zICovCisJCWlmIChuZWVkX3N5bmMpIHsKKwkJ CWdsYW1vcl9ibG9ja19oYW5kbGVyKHNjcm4tPnBTY3JlZW4pOworCQkJaW5mby0+Z3B1X2ZsdXNo ZWQrKzsKKwkJfQorCiAJCXJldCA9IHJhZGVvbl9ib19tYXAoYm8sIDEpOwogCQlpZiAocmV0KSB7 CiAJCQl4Zjg2RHJ2TXNnKHNjcm4tPnNjcm5JbmRleCwgWF9XQVJOSU5HLApAQCAtNzYsMTEgKzc2 LDEwIEBAIHJhZGVvbl9nbGFtb3JfcHJlcGFyZV9hY2Nlc3NfY3B1KFNjcm5JbmZvUHRyIHNjcm4s IFJBREVPTkluZm9QdHIgaW5mbywKIAkJfQogCiAJCXBpeG1hcC0+ZGV2UHJpdmF0ZS5wdHIgPSBi by0+cHRyOwotCQlpbmZvLT5ncHVfc3luY2VkID0gaW5mby0+Z3B1X2ZsdXNoZWQ7Ci0JfSBlbHNl IGlmIChuZWVkX3N5bmMpIHsKLQkJcmFkZW9uX2JvX3dhaXQoYm8pOwotCQlpbmZvLT5ncHVfc3lu Y2VkID0gaW5mby0+Z3B1X2ZsdXNoZWQ7Ci0JfQorCX0gZWxzZSBpZiAobmVlZF9zeW5jKQorCQly YWRlb25fZmluaXNoKHNjcm4sIGJvKTsKKworCWluZm8tPmdwdV9zeW5jZWQgPSBpbmZvLT5ncHVf Zmx1c2hlZDsKIAogCXJldHVybiBUUlVFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3JhZGVvbl9rbXMu YyBiL3NyYy9yYWRlb25fa21zLmMKaW5kZXggODU3OWFhZjgxLi5kNGI1OWU4MWIgMTAwNjQ0Ci0t LSBhL3NyYy9yYWRlb25fa21zLmMKKysrIGIvc3JjL3JhZGVvbl9rbXMuYwpAQCAtMTY4MSw4ICsx NjgxLDcgQEAgdm9pZCBSQURFT05XaW5kb3dFeHBvc3VyZXNfb25lc2hvdChXaW5kb3dQdHIgcFdp biwgUmVnaW9uUHRyIHBSZWdpb24KICAgICBwU2NyZWVuLT5XaW5kb3dFeHBvc3VyZXMocFdpbiwg cFJlZ2lvbik7CiAjZW5kaWYKIAotICAgIHJhZGVvbl9jc19mbHVzaF9pbmRpcmVjdChwU2Nybik7 Ci0gICAgcmFkZW9uX2JvX3dhaXQoaW5mby0+ZnJvbnRfYm8pOworICAgIHJhZGVvbl9maW5pc2go cFNjcm4sIGluZm8tPmZyb250X2JvKTsKICAgICBkcm1tb2RlX3NldF9kZXNpcmVkX21vZGVzKHBT Y3JuLCAmaW5mby0+ZHJtbW9kZSwgVFJVRSk7CiB9CiAKQEAgLTI1ODUsOCArMjU4NCw3IEBAIHZv aWQgUkFERU9OTGVhdmVWVF9LTVMoU2NybkluZm9QdHIgcFNjcm4pCiAJCSAgICByYWRlb25fcGl4 bWFwX2dldF9mYihibGFja19zY2Fub3V0LnBpeG1hcCk7CiAKIAkJcmFkZW9uX3BpeG1hcF9jbGVh cihibGFja19zY2Fub3V0LnBpeG1hcCk7Ci0JCXJhZGVvbl9jc19mbHVzaF9pbmRpcmVjdChwU2Ny bik7Ci0JCXJhZGVvbl9ib193YWl0KGJsYWNrX3NjYW5vdXQuYm8pOworCQlyYWRlb25fZmluaXNo KHBTY3JuLCBibGFja19zY2Fub3V0LmJvKTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgeGY4Nl9jb25m aWctPm51bV9jcnRjOyBpKyspIHsKIAkJICAgIGNydGMgPSB4Zjg2X2NvbmZpZy0+Y3J0Y1tpXTsK ZGlmZiAtLWdpdCBhL3NyYy9yYWRlb25fcHJlc2VudC5jIGIvc3JjL3JhZGVvbl9wcmVzZW50LmMK aW5kZXggZDczNGI5ZDQ0Li42NjgwNWQ3ZGYgMTAwNjQ0Ci0tLSBhL3NyYy9yYWRlb25fcHJlc2Vu dC5jCisrKyBiL3NyYy9yYWRlb25fcHJlc2VudC5jCkBAIC00MDQsOCArNDA0LDYgQEAgcmFkZW9u X3ByZXNlbnRfdW5mbGlwKFNjcmVlblB0ciBzY3JlZW4sIHVpbnQ2NF90IGV2ZW50X2lkKQogCUZM SVBfQVNZTkMgOiBGTElQX1ZTWU5DOwogICAgIGludCBpOwogCi0gICAgcmFkZW9uX2NzX2ZsdXNo X2luZGlyZWN0KHNjcm4pOwotCiAgICAgaWYgKCFyYWRlb25fcHJlc2VudF9jaGVja191bmZsaXAo c2NybikpCiAJZ290byBtb2Rlc2V0OwogCkBAIC00MjQsNyArNDIyLDcgQEAgcmFkZW9uX3ByZXNl bnRfdW5mbGlwKFNjcmVlblB0ciBzY3JlZW4sIHVpbnQ2NF90IGV2ZW50X2lkKQogCXJldHVybjsK IAogbW9kZXNldDoKLSAgICByYWRlb25fYm9fd2FpdChpbmZvLT5mcm9udF9ibyk7CisgICAgcmFk ZW9uX2ZpbmlzaChzY3JuLCBpbmZvLT5mcm9udF9ibyk7CiAgICAgZm9yIChpID0gMDsgaSA8IGNv bmZpZy0+bnVtX2NydGM7IGkrKykgewogCXhmODZDcnRjUHRyIGNydGMgPSBjb25maWctPmNydGNb aV07CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZl cl9wcml2YXRlOwotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK