From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 1/4] Move DRM event queue related initialization to amdgpu_drm_queue_init Date: Tue, 24 Jul 2018 19:16:53 +0200 Message-ID: <20180724171656.13378-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+CgpBbmQgbWFrZSBh bWRncHVfZHJtX3F1ZXVlX2hhbmRsZXIgbm90IGRpcmVjdGx5IGFjY2Vzc2libGUgb3V0c2lkZSBv ZgphbWRncHVfZHJtX3F1ZXVlLmMuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgRMOkbnplciA8bWlj aGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCiBzcmMvYW1kZ3B1X2RyaTIuYyAgICAgIHwgMTQgKysr KysrKystLS0tLS0KIHNyYy9hbWRncHVfZHJtX3F1ZXVlLmMgfCAxMSArKysrKysrKystLQogc3Jj L2FtZGdwdV9kcm1fcXVldWUuaCB8ICA1ICstLS0tCiBzcmMvYW1kZ3B1X2ttcy5jICAgICAgIHwg IDIgKy0KIHNyYy9kcm1tb2RlX2Rpc3BsYXkuYyAgfCAgNCAtLS0tCiA1IGZpbGVzIGNoYW5nZWQs IDE5IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9hbWRn cHVfZHJpMi5jIGIvc3JjL2FtZGdwdV9kcmkyLmMKaW5kZXggYTkyMzhlNTM2Li45NmIyZDE3NjAg MTAwNjQ0Ci0tLSBhL3NyYy9hbWRncHVfZHJpMi5jCisrKyBiL3NyYy9hbWRncHVfZHJpMi5jCkBA IC04NzMsMTMgKzg3MywxNSBAQCBDQVJEMzIgYW1kZ3B1X2RyaTJfZGVmZXJyZWRfZXZlbnQoT3NU aW1lclB0ciB0aW1lciwgQ0FSRDMyIG5vdywgcG9pbnRlciBkYXRhKQogCiAJc2NybiA9IGNydGMt PnNjcm47CiAJcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYoc2Nybik7CisJZHJtbW9kZV9jcnRj ID0gZXZlbnRfaW5mby0+Y3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAJcmV0ID0gZHJtbW9kZV9nZXRf Y3VycmVudF91c3QocEFNREdQVUVudC0+ZmQsICZkcm1fbm93KTsKIAlpZiAocmV0KSB7CiAJCXhm ODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAogCQkJICAgIiVzIGNhbm5vdCBnZXQg Y3VycmVudCB0aW1lXG4iLCBfX2Z1bmNfXyk7CiAJCWlmIChldmVudF9pbmZvLT5kcm1fcXVldWVf c2VxKQotCQkJYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyKHBBTURHUFVFbnQtPmZkLCAwLCAwLCAw LAotCQkJCQkJICh2b2lkKilldmVudF9pbmZvLT5kcm1fcXVldWVfc2VxKTsKKwkJCWRybW1vZGVf Y3J0Yy0+ZHJtbW9kZS0+ZXZlbnRfY29udGV4dC4KKwkJCQl2YmxhbmtfaGFuZGxlcihwQU1ER1BV RW50LT5mZCwgMCwgMCwgMCwKKwkJCQkJICAgICAgICh2b2lkKilldmVudF9pbmZvLT5kcm1fcXVl dWVfc2VxKTsKIAkJZWxzZQogCQkJYW1kZ3B1X2RyaTJfZnJhbWVfZXZlbnRfaGFuZGxlcihjcnRj LCAwLCAwLCBkYXRhKTsKIAkJcmV0dXJuIDA7CkBAIC04ODgsMTUgKzg5MCwxNSBAQCBDQVJEMzIg YW1kZ3B1X2RyaTJfZGVmZXJyZWRfZXZlbnQoT3NUaW1lclB0ciB0aW1lciwgQ0FSRDMyIG5vdywg cG9pbnRlciBkYXRhKQogCSAqIGNhbGN1bGF0ZSB0aGUgZnJhbWUgbnVtYmVyIGZyb20gY3VycmVu dCB0aW1lCiAJICogdGhhdCB3b3VsZCBjb21lIGZyb20gQ1JUQyBpZiBpdCB3ZXJlIHJ1bm5pbmcK IAkgKi8KLQlkcm1tb2RlX2NydGMgPSBldmVudF9pbmZvLT5jcnRjLT5kcml2ZXJfcHJpdmF0ZTsK IAlkZWx0YV90ID0gZHJtX25vdyAtIChDQVJENjQpIGRybW1vZGVfY3J0Yy0+ZHBtc19sYXN0X3Vz dDsKIAlkZWx0YV9zZXEgPSBkZWx0YV90ICogZHJtbW9kZV9jcnRjLT5kcG1zX2xhc3RfZnBzOwog CWRlbHRhX3NlcSAvPSAxMDAwMDAwOwogCWZyYW1lID0gKENBUkQ2NCkgZHJtbW9kZV9jcnRjLT5k cG1zX2xhc3Rfc2VxICsgZGVsdGFfc2VxOwogCWlmIChldmVudF9pbmZvLT5kcm1fcXVldWVfc2Vx KQotCQlhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZXIocEFNREdQVUVudC0+ZmQsIGZyYW1lLCBkcm1f bm93IC8gMTAwMDAwMCwKLQkJCQkJIGRybV9ub3cgJSAxMDAwMDAwLAotCQkJCQkgKHZvaWQqKWV2 ZW50X2luZm8tPmRybV9xdWV1ZV9zZXEpOworCQlkcm1tb2RlX2NydGMtPmRybW1vZGUtPmV2ZW50 X2NvbnRleHQuCisJCQl2YmxhbmtfaGFuZGxlcihwQU1ER1BVRW50LT5mZCwgZnJhbWUsIGRybV9u b3cgLyAxMDAwMDAwLAorCQkJCSAgICAgICBkcm1fbm93ICUgMTAwMDAwMCwKKwkJCQkgICAgICAg KHZvaWQqKWV2ZW50X2luZm8tPmRybV9xdWV1ZV9zZXEpOwogCWVsc2UKIAkJYW1kZ3B1X2RyaTJf ZnJhbWVfZXZlbnRfaGFuZGxlcihjcnRjLCBmcmFtZSwgZHJtX25vdywgZGF0YSk7CiAJcmV0dXJu IDA7CmRpZmYgLS1naXQgYS9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5jIGIvc3JjL2FtZGdwdV9kcm1f cXVldWUuYwppbmRleCBkMTQ1NmNhODQuLmRmZTAxNDhjOCAxMDA2NDQKLS0tIGEvc3JjL2FtZGdw dV9kcm1fcXVldWUuYworKysgYi9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5jCkBAIC01Nyw3ICs1Nyw3 IEBAIHN0YXRpYyB1aW50cHRyX3QgYW1kZ3B1X2RybV9xdWV1ZV9zZXE7CiAvKgogICogSGFuZGxl IGEgRFJNIGV2ZW50CiAgKi8KLXZvaWQKK3N0YXRpYyB2b2lkCiBhbWRncHVfZHJtX3F1ZXVlX2hh bmRsZXIoaW50IGZkLCB1bnNpZ25lZCBpbnQgZnJhbWUsIHVuc2lnbmVkIGludCBzZWMsCiAJCQkg dW5zaWduZWQgaW50IHVzZWMsIHZvaWQgKnVzZXJfcHRyKQogewpAQCAtMTgxLDggKzE4MSwxNSBA QCBhbWRncHVfZHJtX2Fib3J0X2lkKHVpbnQ2NF90IGlkKQogICogSW5pdGlhbGl6ZSB0aGUgRFJN IGV2ZW50IHF1ZXVlCiAgKi8KIHZvaWQKLWFtZGdwdV9kcm1fcXVldWVfaW5pdCgpCithbWRncHVf ZHJtX3F1ZXVlX2luaXQoU2NybkluZm9QdHIgc2NybikKIHsKKwlBTURHUFVJbmZvUHRyIGluZm8g PSBBTURHUFVQVFIoc2Nybik7CisJZHJtbW9kZV9wdHIgZHJtbW9kZSA9ICZpbmZvLT5kcm1tb2Rl OworCisJZHJtbW9kZS0+ZXZlbnRfY29udGV4dC52ZXJzaW9uID0gMjsKKwlkcm1tb2RlLT5ldmVu dF9jb250ZXh0LnZibGFua19oYW5kbGVyID0gYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVyOworCWRy bW1vZGUtPmV2ZW50X2NvbnRleHQucGFnZV9mbGlwX2hhbmRsZXIgPSBhbWRncHVfZHJtX3F1ZXVl X2hhbmRsZXI7CisKIAlpZiAoYW1kZ3B1X2RybV9xdWV1ZV9yZWZjbnQrKykKIAkJcmV0dXJuOwog CmRpZmYgLS1naXQgYS9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5oIGIvc3JjL2FtZGdwdV9kcm1fcXVl dWUuaAppbmRleCAzNmVlOTAwYWEuLjMyOGI1ZTZiMSAxMDA2NDQKLS0tIGEvc3JjL2FtZGdwdV9k cm1fcXVldWUuaAorKysgYi9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5oCkBAIC00Miw5ICs0Miw2IEBA IHR5cGVkZWYgdm9pZCAoKmFtZGdwdV9kcm1faGFuZGxlcl9wcm9jKSh4Zjg2Q3J0Y1B0ciBjcnRj LCB1aW50MzJfdCBzZXEsCiAJCQkJCXVpbnQ2NF90IHVzZWMsIHZvaWQgKmRhdGEpOwogdHlwZWRl ZiB2b2lkICgqYW1kZ3B1X2RybV9hYm9ydF9wcm9jKSh4Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpk YXRhKTsKIAotdm9pZCBhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZXIoaW50IGZkLCB1bnNpZ25lZCBp bnQgZnJhbWUsCi0JCQkgICAgICB1bnNpZ25lZCBpbnQgdHZfc2VjLCB1bnNpZ25lZCBpbnQgdHZf dXNlYywKLQkJCSAgICAgIHZvaWQgKnVzZXJfcHRyKTsKIHVpbnRwdHJfdCBhbWRncHVfZHJtX3F1 ZXVlX2FsbG9jKHhmODZDcnRjUHRyIGNydGMsIENsaWVudFB0ciBjbGllbnQsCiAJCQkJIHVpbnQ2 NF90IGlkLCB2b2lkICpkYXRhLAogCQkJCSBhbWRncHVfZHJtX2hhbmRsZXJfcHJvYyBoYW5kbGVy LApAQCAtNTIsNyArNDksNyBAQCB1aW50cHRyX3QgYW1kZ3B1X2RybV9xdWV1ZV9hbGxvYyh4Zjg2 Q3J0Y1B0ciBjcnRjLCBDbGllbnRQdHIgY2xpZW50LAogdm9pZCBhbWRncHVfZHJtX2Fib3J0X2Ns aWVudChDbGllbnRQdHIgY2xpZW50KTsKIHZvaWQgYW1kZ3B1X2RybV9hYm9ydF9lbnRyeSh1aW50 cHRyX3Qgc2VxKTsKIHZvaWQgYW1kZ3B1X2RybV9hYm9ydF9pZCh1aW50NjRfdCBpZCk7Ci12b2lk IGFtZGdwdV9kcm1fcXVldWVfaW5pdCgpOwordm9pZCBhbWRncHVfZHJtX3F1ZXVlX2luaXQoU2Ny bkluZm9QdHIgc2Nybik7CiB2b2lkIGFtZGdwdV9kcm1fcXVldWVfY2xvc2UoU2NybkluZm9QdHIg c2Nybik7CiAKICNlbmRpZiAvKiBfQU1ER1BVX0RSTV9RVUVVRV9IXyAqLwpkaWZmIC0tZ2l0IGEv c3JjL2FtZGdwdV9rbXMuYyBiL3NyYy9hbWRncHVfa21zLmMKaW5kZXggN2IxM2Q3NzdlLi5lMjky NWNjODMgMTAwNjQ0Ci0tLSBhL3NyYy9hbWRncHVfa21zLmMKKysrIGIvc3JjL2FtZGdwdV9rbXMu YwpAQCAtMTQwNyw3ICsxNDA3LDcgQEAgQm9vbCBBTURHUFVQcmVJbml0X0tNUyhTY3JuSW5mb1B0 ciBwU2NybiwgaW50IGZsYWdzKQogCWlmICghQU1ER1BVUHJlSW5pdEFjY2VsX0tNUyhwU2Nybikp CiAJCXJldHVybiBGQUxTRTsKIAotCWFtZGdwdV9kcm1fcXVldWVfaW5pdCgpOworCWFtZGdwdV9k cm1fcXVldWVfaW5pdChwU2Nybik7CiAKIAkvKiBkb24ndCBlbmFibGUgdGlsaW5nIGlmIGFjY2Vs IGlzIG5vdCBlbmFibGVkICovCiAJaWYgKGluZm8tPnVzZV9nbGFtb3IpIHsKZGlmZiAtLWdpdCBh L3NyYy9kcm1tb2RlX2Rpc3BsYXkuYyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwppbmRleCA5MmY1 OGMxNTcuLmM0NWI3OWQyMSAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5jCisrKyBi L3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwpAQCAtMzMxNSwxMCArMzMxNSw2IEBAIEJvb2wgZHJtbW9k ZV9wcmVfaW5pdChTY3JuSW5mb1B0ciBwU2NybiwgZHJtbW9kZV9wdHIgZHJtbW9kZSwgaW50IGNw cCkKIAogCXhmODZJbml0aWFsQ29uZmlndXJhdGlvbihwU2NybiwgVFJVRSk7CiAKLQlkcm1tb2Rl LT5ldmVudF9jb250ZXh0LnZlcnNpb24gPSAyOwotCWRybW1vZGUtPmV2ZW50X2NvbnRleHQudmJs YW5rX2hhbmRsZXIgPSBhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZXI7Ci0JZHJtbW9kZS0+ZXZlbnRf Y29udGV4dC5wYWdlX2ZsaXBfaGFuZGxlciA9IGFtZGdwdV9kcm1fcXVldWVfaGFuZGxlcjsKLQog CXBBTURHUFVFbnQtPmhhc19wYWdlX2ZsaXBfdGFyZ2V0ID0gZHJtbW9kZV9wcm9iZV9wYWdlX2Zs aXBfdGFyZ2V0KHBBTURHUFVFbnQpOwogCiAJZHJtTW9kZUZyZWVSZXNvdXJjZXMobW9kZV9yZXMp OwotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK