From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 2.5/4] Add amdgpu_drm_handle_event wrapper for drmHandleEvent Date: Fri, 3 Aug 2018 18:18:27 +0200 Message-ID: <20180803161827.10939-1-michel@daenzer.net> References: <20180724171656.13378-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180724171656.13378-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+CgpJbnN0ZWFkIG9m IHByb2Nlc3NpbmcgRFJNIGV2ZW50cyBkaXJlY3RseSBmcm9tIGRybUhhbmRsZUV2ZW50J3MKY2Fs bGJhY2tzLCB0aGVyZSBhcmUgdGhyZWUgcGhhc2VzOgoKMS4gZHJtSGFuZGxlRXZlbnQgaXMgY2Fs bGVkLCBhbmQgc2lnbmFsbGVkIGV2ZW50cyBhcmUgcmUtcXVldWVkIHRvCiAgIF9zaWduYWxsZWQg bGlzdHMgZnJvbSBpdHMgY2FsbGJhY2tzLgoyLiBTaWduYWxsZWQgcGFnZSBmbGlwIGNvbXBsZXRp b24gZXZlbnRzIGFyZSBwcm9jZXNzZWQuCjMuIFNpZ25hbGxlZCB2YmxhbmsgZXZlbnRzIGFyZSBw cm9jZXNzZWQuCgpUaGlzIHNob3VsZCBtYWtlIHN1cmUgdGhhdCB3ZSBuZXZlciBjYWxsIGRybUhh bmRsZUV2ZW50IGZyb20gb25lIG9mIGl0cwpjYWxsYmFja3MsIHdoaWNoIHdvdWxkIHVzdWFsbHkg cmVzdWx0IGluIGJsb2NraW5nIGZvcmV2ZXIuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgRMOkbnpl ciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCiBzcmMvYW1kZ3B1X2RybV9xdWV1ZS5jIHwg OTQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBzcmMvYW1kZ3B1 X2RybV9xdWV1ZS5oIHwgIDEgKwogc3JjL2FtZGdwdV9wcmVzZW50LmMgICB8ICAyICstCiBzcmMv ZHJtbW9kZV9kaXNwbGF5LmMgIHwgIDQgKy0KIDQgZmlsZXMgY2hhbmdlZCwgODMgaW5zZXJ0aW9u cygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9kcm1fcXVldWUu YyBiL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmMKaW5kZXggOWMwMTY2MTQ3Li5mODY2MDgyOGMgMTAw NjQ0Ci0tLSBhL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmMKKysrIGIvc3JjL2FtZGdwdV9kcm1fcXVl dWUuYwpAQCAtNDAsNiArNDAsNyBAQAogCiBzdHJ1Y3QgYW1kZ3B1X2RybV9xdWV1ZV9lbnRyeSB7 CiAJc3RydWN0IHhvcmdfbGlzdCBsaXN0OworCXVpbnQ2NF90IHVzZWM7CiAJdWludDY0X3QgaWQ7 CiAJdWludHB0cl90IHNlcTsKIAl2b2lkICpkYXRhOwpAQCAtNDcsMzggKzQ4LDc1IEBAIHN0cnVj dCBhbWRncHVfZHJtX3F1ZXVlX2VudHJ5IHsKIAl4Zjg2Q3J0Y1B0ciBjcnRjOwogCWFtZGdwdV9k cm1faGFuZGxlcl9wcm9jIGhhbmRsZXI7CiAJYW1kZ3B1X2RybV9hYm9ydF9wcm9jIGFib3J0Owor CXVuc2lnbmVkIGludCBmcmFtZTsKIH07CiAKIHN0YXRpYyBpbnQgYW1kZ3B1X2RybV9xdWV1ZV9y ZWZjbnQ7CiBzdGF0aWMgc3RydWN0IHhvcmdfbGlzdCBhbWRncHVfZHJtX3F1ZXVlOworc3RhdGlj IHN0cnVjdCB4b3JnX2xpc3QgYW1kZ3B1X2RybV9mbGlwX3NpZ25hbGxlZDsKK3N0YXRpYyBzdHJ1 Y3QgeG9yZ19saXN0IGFtZGdwdV9kcm1fdmJsYW5rX3NpZ25hbGxlZDsKIHN0YXRpYyB1aW50cHRy X3QgYW1kZ3B1X2RybV9xdWV1ZV9zZXE7CiAKIAogLyoKLSAqIEhhbmRsZSBhIERSTSBldmVudAor ICogUHJvY2VzcyBhIERSTSBldmVudAogICovCiBzdGF0aWMgdm9pZAotYW1kZ3B1X2RybV9xdWV1 ZV9oYW5kbGVyKGludCBmZCwgdW5zaWduZWQgaW50IGZyYW1lLCB1bnNpZ25lZCBpbnQgc2VjLAot CQkJIHVuc2lnbmVkIGludCB1c2VjLCB2b2lkICp1c2VyX3B0cikKK2FtZGdwdV9kcm1fcXVldWVf aGFuZGxlX29uZShzdHJ1Y3QgYW1kZ3B1X2RybV9xdWV1ZV9lbnRyeSAqZSkKK3sKKwl4b3JnX2xp c3RfZGVsKCZlLT5saXN0KTsKKwlpZiAoZS0+aGFuZGxlcikgeworCQllLT5oYW5kbGVyKGUtPmNy dGMsIGUtPmZyYW1lLCBlLT51c2VjLCBlLT5kYXRhKTsKKwl9IGVsc2UKKwkJZS0+YWJvcnQoZS0+ Y3J0YywgZS0+ZGF0YSk7CisJZnJlZShlKTsKK30KKworc3RhdGljIHZvaWQKK2FtZGdwdV9kcm1f cXVldWVfaGFuZGxlcihzdHJ1Y3QgeG9yZ19saXN0ICpzaWduYWxsZWQsIHVuc2lnbmVkIGludCBm cmFtZSwKKwkJCSB1bnNpZ25lZCBpbnQgc2VjLCB1bnNpZ25lZCBpbnQgdXNlYywgdm9pZCAqdXNl cl9wdHIpCiB7CiAJdWludHB0cl90IHNlcSA9ICh1aW50cHRyX3QpdXNlcl9wdHI7CiAJc3RydWN0 IGFtZGdwdV9kcm1fcXVldWVfZW50cnkgKmUsICp0bXA7CiAKIAl4b3JnX2xpc3RfZm9yX2VhY2hf ZW50cnlfc2FmZShlLCB0bXAsICZhbWRncHVfZHJtX3F1ZXVlLCBsaXN0KSB7CiAJCWlmIChlLT5z ZXEgPT0gc2VxKSB7Ci0JCQl4b3JnX2xpc3RfZGVsKCZlLT5saXN0KTsKLQkJCWlmIChlLT5oYW5k bGVyKQotCQkJCWUtPmhhbmRsZXIoZS0+Y3J0YywgZnJhbWUsCi0JCQkJCSAgICh1aW50NjRfdClz ZWMgKiAxMDAwMDAwICsgdXNlYywKLQkJCQkJICAgZS0+ZGF0YSk7Ci0JCQllbHNlCisJCQlpZiAo IWUtPmhhbmRsZXIpIHsKIAkJCQllLT5hYm9ydChlLT5jcnRjLCBlLT5kYXRhKTsKLQkJCWZyZWUo ZSk7CisJCQkJYnJlYWs7CisJCQl9CisKKwkJCXhvcmdfbGlzdF9kZWwoJmUtPmxpc3QpOworCQkJ ZS0+dXNlYyA9ICh1aW50NjRfdClzZWMgKiAxMDAwMDAwICsgdXNlYzsKKwkJCWUtPmZyYW1lID0g ZnJhbWU7CisJCQl4b3JnX2xpc3RfYXBwZW5kKCZlLT5saXN0LCBzaWduYWxsZWQpOwogCQkJYnJl YWs7CiAJCX0KIAl9CiB9CiAKKy8qCisgKiBTaWduYWwgYSBEUk0gcGFnZSBmbGlwIGV2ZW50Cisg Ki8KK3N0YXRpYyB2b2lkCithbWRncHVfZHJtX3BhZ2VfZmxpcF9oYW5kbGVyKGludCBmZCwgdW5z aWduZWQgaW50IGZyYW1lLCB1bnNpZ25lZCBpbnQgc2VjLAorCQkJICAgICB1bnNpZ25lZCBpbnQg dXNlYywgdm9pZCAqdXNlcl9wdHIpCit7CisJYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyKCZhbWRn cHVfZHJtX2ZsaXBfc2lnbmFsbGVkLCBmcmFtZSwgc2VjLCB1c2VjLAorCQkJCSB1c2VyX3B0cik7 Cit9CisKKy8qCisgKiBTaWduYWwgYSBEUk0gdmJsYW5rIGV2ZW50CisgKi8KK3N0YXRpYyB2b2lk CithbWRncHVfZHJtX3ZibGFua19oYW5kbGVyKGludCBmZCwgdW5zaWduZWQgaW50IGZyYW1lLCB1 bnNpZ25lZCBpbnQgc2VjLAorCQkJICB1bnNpZ25lZCBpbnQgdXNlYywgdm9pZCAqdXNlcl9wdHIp Cit7CisJYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyKCZhbWRncHVfZHJtX3ZibGFua19zaWduYWxs ZWQsIGZyYW1lLCBzZWMsIHVzZWMsCisJCQkJIHVzZXJfcHRyKTsKK30KKwogLyoKICAqIEVucXVl dWUgYSBwb3RlbnRpYWwgZHJtIHJlc3BvbnNlOyB3aGVuIHRoZSBhc3NvY2lhdGVkIHJlc3BvbnNl CiAgKiBhcHBlYXJzLCB3ZSd2ZSBnb3QgZGF0YSB0byBwYXNzIHRvIHRoZSBoYW5kbGVyIGZyb20g aGVyZQpAQCAtMTc3LDYgKzIxNSwyNiBAQCBhbWRncHVfZHJtX2Fib3J0X2lkKHVpbnQ2NF90IGlk KQogCX0KIH0KIAorLyoKKyAqIGRybUhhbmRsZUV2ZW50IHdyYXBwZXIKKyAqLworaW50CithbWRn cHVfZHJtX2hhbmRsZV9ldmVudChpbnQgZmQsIGRybUV2ZW50Q29udGV4dCAqZXZlbnRfY29udGV4 dCkKK3sKKwlzdHJ1Y3QgYW1kZ3B1X2RybV9xdWV1ZV9lbnRyeSAqZSwgKnRtcDsKKwlpbnQgcjsK KworCXIgPSBkcm1IYW5kbGVFdmVudChmZCwgZXZlbnRfY29udGV4dCk7CisKKwl4b3JnX2xpc3Rf Zm9yX2VhY2hfZW50cnlfc2FmZShlLCB0bXAsICZhbWRncHVfZHJtX2ZsaXBfc2lnbmFsbGVkLCBs aXN0KQorCQlhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZV9vbmUoZSk7CisKKwl4b3JnX2xpc3RfZm9y X2VhY2hfZW50cnlfc2FmZShlLCB0bXAsICZhbWRncHVfZHJtX3ZibGFua19zaWduYWxsZWQsIGxp c3QpCisJCWFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX29uZShlKTsKKworCXJldHVybiByOworfQor CiAvKgogICogV2FpdCBmb3IgcGVuZGluZyBwYWdlIGZsaXAgb24gZ2l2ZW4gQ1JUQyB0byBjb21w bGV0ZQogICovCkBAIC0xODQsMTAgKzI0MiwxNCBAQCB2b2lkIGFtZGdwdV9kcm1fd2FpdF9wZW5k aW5nX2ZsaXAoeGY4NkNydGNQdHIgY3J0YykKIHsKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIg ZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAJQU1ER1BVRW50UHRyIHBBTURH UFVFbnQgPSBBTURHUFVFbnRQcml2KGNydGMtPnNjcm4pOwotCWRybW1vZGVfcHRyIGRybW1vZGUg PSBkcm1tb2RlX2NydGMtPmRybW1vZGU7CisJc3RydWN0IGFtZGdwdV9kcm1fcXVldWVfZW50cnkg KmUsICp0bXA7CisKKwl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShlLCB0bXAsICZhbWRn cHVfZHJtX2ZsaXBfc2lnbmFsbGVkLCBsaXN0KQorCQlhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZV9v bmUoZSk7CiAKLQl3aGlsZSAoZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcgJiYKLQkgICAgICAg ZHJtSGFuZGxlRXZlbnQocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlLT5ldmVudF9jb250ZXh0KSA+ IDApOworCXdoaWxlIChkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZworCSAgICAgICAmJiBhbWRn cHVfZHJtX2hhbmRsZV9ldmVudChwQU1ER1BVRW50LT5mZCwKKwkJCQkJICAmZHJtbW9kZV9jcnRj LT5kcm1tb2RlLT5ldmVudF9jb250ZXh0KSA+IDApOwogfQogCiAvKgpAQCAtMjAwLDEzICsyNjIs MTUgQEAgYW1kZ3B1X2RybV9xdWV1ZV9pbml0KFNjcm5JbmZvUHRyIHNjcm4pCiAJZHJtbW9kZV9w dHIgZHJtbW9kZSA9ICZpbmZvLT5kcm1tb2RlOwogCiAJZHJtbW9kZS0+ZXZlbnRfY29udGV4dC52 ZXJzaW9uID0gMjsKLQlkcm1tb2RlLT5ldmVudF9jb250ZXh0LnZibGFua19oYW5kbGVyID0gYW1k Z3B1X2RybV9xdWV1ZV9oYW5kbGVyOwotCWRybW1vZGUtPmV2ZW50X2NvbnRleHQucGFnZV9mbGlw X2hhbmRsZXIgPSBhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZXI7CisJZHJtbW9kZS0+ZXZlbnRfY29u dGV4dC52YmxhbmtfaGFuZGxlciA9IGFtZGdwdV9kcm1fdmJsYW5rX2hhbmRsZXI7CisJZHJtbW9k ZS0+ZXZlbnRfY29udGV4dC5wYWdlX2ZsaXBfaGFuZGxlciA9IGFtZGdwdV9kcm1fcGFnZV9mbGlw X2hhbmRsZXI7CiAKIAlpZiAoYW1kZ3B1X2RybV9xdWV1ZV9yZWZjbnQrKykKIAkJcmV0dXJuOwog CiAJeG9yZ19saXN0X2luaXQoJmFtZGdwdV9kcm1fcXVldWUpOworCXhvcmdfbGlzdF9pbml0KCZh bWRncHVfZHJtX2ZsaXBfc2lnbmFsbGVkKTsKKwl4b3JnX2xpc3RfaW5pdCgmYW1kZ3B1X2RybV92 Ymxhbmtfc2lnbmFsbGVkKTsKIH0KIAogLyoKZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfZHJtX3F1 ZXVlLmggYi9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5oCmluZGV4IGNiNmQ1ZmY1OS4uNDhiYTlhYjZl IDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5oCisrKyBiL3NyYy9hbWRncHVfZHJt X3F1ZXVlLmgKQEAgLTQ5LDYgKzQ5LDcgQEAgdWludHB0cl90IGFtZGdwdV9kcm1fcXVldWVfYWxs b2MoeGY4NkNydGNQdHIgY3J0YywgQ2xpZW50UHRyIGNsaWVudCwKIHZvaWQgYW1kZ3B1X2RybV9h Ym9ydF9jbGllbnQoQ2xpZW50UHRyIGNsaWVudCk7CiB2b2lkIGFtZGdwdV9kcm1fYWJvcnRfZW50 cnkodWludHB0cl90IHNlcSk7CiB2b2lkIGFtZGdwdV9kcm1fYWJvcnRfaWQodWludDY0X3QgaWQp OworaW50IGFtZGdwdV9kcm1faGFuZGxlX2V2ZW50KGludCBmZCwgZHJtRXZlbnRDb250ZXh0ICpl dmVudF9jb250ZXh0KTsKIHZvaWQgYW1kZ3B1X2RybV93YWl0X3BlbmRpbmdfZmxpcCh4Zjg2Q3J0 Y1B0ciBjcnRjKTsKIHZvaWQgYW1kZ3B1X2RybV9xdWV1ZV9pbml0KFNjcm5JbmZvUHRyIHNjcm4p Owogdm9pZCBhbWRncHVfZHJtX3F1ZXVlX2Nsb3NlKFNjcm5JbmZvUHRyIHNjcm4pOwpkaWZmIC0t Z2l0IGEvc3JjL2FtZGdwdV9wcmVzZW50LmMgYi9zcmMvYW1kZ3B1X3ByZXNlbnQuYwppbmRleCA0 ZTc0YmZhYzkuLmE2Njc2YWZkZiAxMDA2NDQKLS0tIGEvc3JjL2FtZGdwdV9wcmVzZW50LmMKKysr IGIvc3JjL2FtZGdwdV9wcmVzZW50LmMKQEAgLTExMCw3ICsxMTAsNyBAQCBhbWRncHVfcHJlc2Vu dF9mbHVzaF9kcm1fZXZlbnRzKFNjcmVlblB0ciBzY3JlZW4pCiAJaWYgKHIgPD0gMCkKIAkJcmV0 dXJuIDA7CiAKLQlyZXR1cm4gZHJtSGFuZGxlRXZlbnQocEFNREdQVUVudC0+ZmQsICZkcm1tb2Rl LT5ldmVudF9jb250ZXh0KSA+PSAwOworCXJldHVybiBhbWRncHVfZHJtX2hhbmRsZV9ldmVudChw QU1ER1BVRW50LT5mZCwgJmRybW1vZGUtPmV2ZW50X2NvbnRleHQpID49IDA7CiB9CiAKIC8qCmRp ZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMK aW5kZXggN2Y1MjFiNjZkLi4xNjdiMzAwOTEgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1tb2RlX2Rpc3Bs YXkuYworKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKQEAgLTMwOTYsNyArMzA5Niw3IEBAIGRy bW1vZGVfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IGZyYW1lLCB1aW50 NjRfdCB1c2VjLCB2b2lkICpldmVuCiBzdGF0aWMgdm9pZCBkcm1tb2RlX25vdGlmeV9mZChpbnQg ZmQsIGludCBub3RpZnksIHZvaWQgKmRhdGEpCiB7CiAJZHJtbW9kZV9wdHIgZHJtbW9kZSA9IGRh dGE7Ci0JZHJtSGFuZGxlRXZlbnQoZmQsICZkcm1tb2RlLT5ldmVudF9jb250ZXh0KTsKKwlhbWRn cHVfZHJtX2hhbmRsZV9ldmVudChmZCwgJmRybW1vZGUtPmV2ZW50X2NvbnRleHQpOwogfQogI2Vs c2UKIHN0YXRpYyB2b2lkIGRybV93YWtldXBfaGFuZGxlcihwb2ludGVyIGRhdGEsIGludCBlcnIs IHBvaW50ZXIgcCkKQEAgLTMxMDYsNyArMzEwNiw3IEBAIHN0YXRpYyB2b2lkIGRybV93YWtldXBf aGFuZGxlcihwb2ludGVyIGRhdGEsIGludCBlcnIsIHBvaW50ZXIgcCkKIAlmZF9zZXQgKnJlYWRf bWFzayA9IHA7CiAKIAlpZiAoZXJyID49IDAgJiYgRkRfSVNTRVQocEFNREdQVUVudC0+ZmQsIHJl YWRfbWFzaykpIHsKLQkJZHJtSGFuZGxlRXZlbnQocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlLT5l dmVudF9jb250ZXh0KTsKKwkJYW1kZ3B1X2RybV9oYW5kbGVfZXZlbnQocEFNREdQVUVudC0+ZmQs ICZkcm1tb2RlLT5ldmVudF9jb250ZXh0KTsKIAl9CiB9CiAjZW5kaWYKLS0gCjIuMTguMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWls aW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==