From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH v2 xf86-video-amdgpu 3/4] Defer vblank event handling while waiting for a pending flip Date: Fri, 3 Aug 2018 18:19:14 +0200 Message-ID: <20180803161914.11032-1-michel@daenzer.net> References: <20180724171656.13378-3-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-3-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+CgpUaGlzIGlzIHRv IGF2b2lkIHN1Ym1pdHRpbmcgbW9yZSBmbGlwcyB3aGlsZSB3ZSBhcmUgd2FpdGluZyBmb3IgcGVu ZGluZwpvbmVzIHRvIGNvbXBsZXRlLgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1p Y2hlbC5kYWVuemVyQGFtZC5jb20+Ci0tLQoKdjI6CiogUmViYXNlZCBvbiB0b3Agb2YgbmV3IHBh dGNoIDIuNQoKIHNyYy9hbWRncHVfZHJtX3F1ZXVlLmMgfCA0MSArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLQogc3JjL2FtZGdwdV9kcm1fcXVldWUuaCB8ICAxICsKIHNy Yy9kcm1tb2RlX2Rpc3BsYXkuYyAgfCAxOCArKysrKysrKysrKystLS0tLS0KIHNyYy9kcm1tb2Rl X2Rpc3BsYXkuaCAgfCAgNCArKysrCiA0IGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyks IDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2FtZGdwdV9kcm1fcXVldWUuYyBiL3Ny Yy9hbWRncHVfZHJtX3F1ZXVlLmMKaW5kZXggZjg2NjA4MjhjLi5iMTNkMjgwMTQgMTAwNjQ0Ci0t LSBhL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmMKKysrIGIvc3JjL2FtZGdwdV9kcm1fcXVldWUuYwpA QCAtMTE3LDYgKzExNywzMCBAQCBhbWRncHVfZHJtX3ZibGFua19oYW5kbGVyKGludCBmZCwgdW5z aWduZWQgaW50IGZyYW1lLCB1bnNpZ25lZCBpbnQgc2VjLAogCQkJCSB1c2VyX3B0cik7CiB9CiAK Ky8qCisgKiBIYW5kbGUgZGVmZXJyZWQgRFJNIHZibGFuayBldmVudHMKKyAqCisgKiBUaGlzIGZ1 bmN0aW9uIG11c3QgYmUgY2FsbGVkIGFmdGVyIGFtZGdwdV9kcm1fd2FpdF9wZW5kaW5nX2ZsaXAs IG9uY2UKKyAqIGl0J3Mgc2FmZSB0byBhdHRlbXB0IHF1ZXVlaW5nIGEgZmxpcCBhZ2FpbgorICov Cit2b2lkCithbWRncHVfZHJtX3F1ZXVlX2hhbmRsZV9kZWZlcnJlZCh4Zjg2Q3J0Y1B0ciBjcnRj KQoreworCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2 ZXJfcHJpdmF0ZTsKKwlzdHJ1Y3QgYW1kZ3B1X2RybV9xdWV1ZV9lbnRyeSAqZSwgKnRtcDsKKwor CWlmIChkcm1tb2RlX2NydGMtPndhaXRfZmxpcF9uZXN0aW5nX2xldmVsID09IDAgfHwKKwkgICAg LS1kcm1tb2RlX2NydGMtPndhaXRfZmxpcF9uZXN0aW5nX2xldmVsID4gMCkKKwkJcmV0dXJuOwor CisJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZSwgdG1wLCAmYW1kZ3B1X2RybV92Ymxh bmtfc2lnbmFsbGVkLCBsaXN0KSB7CisJCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2Rl X2NydGMgPSBlLT5jcnRjLT5kcml2ZXJfcHJpdmF0ZTsKKworCQlpZiAoZHJtbW9kZV9jcnRjLT53 YWl0X2ZsaXBfbmVzdGluZ19sZXZlbCA9PSAwKQorCQkJYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVf b25lKGUpOworCX0KK30KKwogLyoKICAqIEVucXVldWUgYSBwb3RlbnRpYWwgZHJtIHJlc3BvbnNl OyB3aGVuIHRoZSBhc3NvY2lhdGVkIHJlc3BvbnNlCiAgKiBhcHBlYXJzLCB3ZSd2ZSBnb3QgZGF0 YSB0byBwYXNzIHRvIHRoZSBoYW5kbGVyIGZyb20gaGVyZQpAQCAtMTkxLDYgKzIxNSwxMyBAQCBh bWRncHVfZHJtX2Fib3J0X2VudHJ5KHVpbnRwdHJfdCBzZXEpCiAJaWYgKHNlcSA9PSBBTURHUFVf RFJNX1FVRVVFX0VSUk9SKQogCQlyZXR1cm47CiAKKwl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnlf c2FmZShlLCB0bXAsICZhbWRncHVfZHJtX3ZibGFua19zaWduYWxsZWQsIGxpc3QpIHsKKwkJaWYg KGUtPnNlcSA9PSBzZXEpIHsKKwkJCWFtZGdwdV9kcm1fYWJvcnRfb25lKGUpOworCQkJcmV0dXJu OworCQl9CisJfQorCiAJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZSwgdG1wLCAmYW1k Z3B1X2RybV9xdWV1ZSwgbGlzdCkgewogCQlpZiAoZS0+c2VxID09IHNlcSkgewogCQkJYW1kZ3B1 X2RybV9hYm9ydF9vbmUoZSk7CkBAIC0yMjksOCArMjYwLDEyIEBAIGFtZGdwdV9kcm1faGFuZGxl X2V2ZW50KGludCBmZCwgZHJtRXZlbnRDb250ZXh0ICpldmVudF9jb250ZXh0KQogCXhvcmdfbGlz dF9mb3JfZWFjaF9lbnRyeV9zYWZlKGUsIHRtcCwgJmFtZGdwdV9kcm1fZmxpcF9zaWduYWxsZWQs IGxpc3QpCiAJCWFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX29uZShlKTsKIAotCXhvcmdfbGlzdF9m b3JfZWFjaF9lbnRyeV9zYWZlKGUsIHRtcCwgJmFtZGdwdV9kcm1fdmJsYW5rX3NpZ25hbGxlZCwg bGlzdCkKLQkJYW1kZ3B1X2RybV9xdWV1ZV9oYW5kbGVfb25lKGUpOworCXhvcmdfbGlzdF9mb3Jf ZWFjaF9lbnRyeV9zYWZlKGUsIHRtcCwgJmFtZGdwdV9kcm1fdmJsYW5rX3NpZ25hbGxlZCwgbGlz dCkgeworCQlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gZS0+Y3J0Yy0+ ZHJpdmVyX3ByaXZhdGU7CisKKwkJaWYgKGRybW1vZGVfY3J0Yy0+d2FpdF9mbGlwX25lc3Rpbmdf bGV2ZWwgPT0gMCkKKwkJCWFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX29uZShlKTsKKwl9CiAKIAly ZXR1cm4gcjsKIH0KQEAgLTI0NCw2ICsyNzksOCBAQCB2b2lkIGFtZGdwdV9kcm1fd2FpdF9wZW5k aW5nX2ZsaXAoeGY4NkNydGNQdHIgY3J0YykKIAlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFN REdQVUVudFByaXYoY3J0Yy0+c2Nybik7CiAJc3RydWN0IGFtZGdwdV9kcm1fcXVldWVfZW50cnkg KmUsICp0bXA7CiAKKwlkcm1tb2RlX2NydGMtPndhaXRfZmxpcF9uZXN0aW5nX2xldmVsKys7CisK IAl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShlLCB0bXAsICZhbWRncHVfZHJtX2ZsaXBf c2lnbmFsbGVkLCBsaXN0KQogCQlhbWRncHVfZHJtX3F1ZXVlX2hhbmRsZV9vbmUoZSk7CiAKZGlm ZiAtLWdpdCBhL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmggYi9zcmMvYW1kZ3B1X2RybV9xdWV1ZS5o CmluZGV4IDQ4YmE5YWI2ZS4uNGU3YzhmNGM0IDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X2RybV9x dWV1ZS5oCisrKyBiL3NyYy9hbWRncHVfZHJtX3F1ZXVlLmgKQEAgLTQyLDYgKzQyLDcgQEAgdHlw ZWRlZiB2b2lkICgqYW1kZ3B1X2RybV9oYW5kbGVyX3Byb2MpKHhmODZDcnRjUHRyIGNydGMsIHVp bnQzMl90IHNlcSwKIAkJCQkJdWludDY0X3QgdXNlYywgdm9pZCAqZGF0YSk7CiB0eXBlZGVmIHZv aWQgKCphbWRncHVfZHJtX2Fib3J0X3Byb2MpKHhmODZDcnRjUHRyIGNydGMsIHZvaWQgKmRhdGEp OwogCit2b2lkIGFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX2RlZmVycmVkKHhmODZDcnRjUHRyIGNy dGMpOwogdWludHB0cl90IGFtZGdwdV9kcm1fcXVldWVfYWxsb2MoeGY4NkNydGNQdHIgY3J0Yywg Q2xpZW50UHRyIGNsaWVudCwKIAkJCQkgdWludDY0X3QgaWQsIHZvaWQgKmRhdGEsCiAJCQkJIGFt ZGdwdV9kcm1faGFuZGxlcl9wcm9jIGhhbmRsZXIsCmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9k aXNwbGF5LmMgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKaW5kZXggMTY3YjMwMDkxLi45OTE5YzA5 MjMgMTAwNjQ0Ci0tLSBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYworKysgYi9zcmMvZHJtbW9kZV9k aXNwbGF5LmMKQEAgLTMwNSw2ICszMDUsOSBAQCBkcm1tb2RlX2RvX2NydGNfZHBtcyh4Zjg2Q3J0 Y1B0ciBjcnRjLCBpbnQgbW9kZSkKIAkJCQlub21pbmFsX2ZyYW1lX3JhdGUgLz0gcGl4X2luX2Zy YW1lOwogCQkJZHJtbW9kZV9jcnRjLT5kcG1zX2xhc3RfZnBzID0gbm9taW5hbF9mcmFtZV9yYXRl OwogCQl9CisKKwkJZHJtbW9kZV9jcnRjLT5kcG1zX21vZGUgPSBtb2RlOworCQlhbWRncHVfZHJt X3F1ZXVlX2hhbmRsZV9kZWZlcnJlZChjcnRjKTsKIAl9IGVsc2UgaWYgKGRybW1vZGVfY3J0Yy0+ ZHBtc19tb2RlICE9IERQTVNNb2RlT24gJiYgbW9kZSA9PSBEUE1TTW9kZU9uKSB7CiAJCS8qCiAJ CSAqIE9mZi0+T24gdHJhbnNpdGlvbjogY2FsY3VsYXRlIGFuZCBhY2N1bXVsYXRlIHRoZQpAQCAt MzIyLDggKzMyNSw5IEBAIGRybW1vZGVfZG9fY3J0Y19kcG1zKHhmODZDcnRjUHRyIGNydGMsIGlu dCBtb2RlKQogCQkJZHJtbW9kZV9jcnRjLT5pbnRlcnBvbGF0ZWRfdmJsYW5rcyArPSBkZWx0YV9z ZXE7CiAKIAkJfQorCisJCWRybW1vZGVfY3J0Yy0+ZHBtc19tb2RlID0gRFBNU01vZGVPbjsKIAl9 Ci0JZHJtbW9kZV9jcnRjLT5kcG1zX21vZGUgPSBtb2RlOwogfQogCiBzdGF0aWMgdm9pZApAQCAt MTQxNSw2ICsxNDE5LDcgQEAgZG9uZToKIAkJfQogCX0KIAorCWFtZGdwdV9kcm1fcXVldWVfaGFu ZGxlX2RlZmVycmVkKGNydGMpOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTIzMjAsMTEgKzIzMjUs NiBAQCBkcm1tb2RlX291dHB1dF9zZXRfdGVhcl9mcmVlKEFNREdQVUVudFB0ciBwQU1ER1BVRW50 LAogCWRybW1vZGVfb3V0cHV0LT50ZWFyX2ZyZWUgPSB0ZWFyX2ZyZWU7CiAKIAlpZiAoY3J0Yykg ewotCQkvKiBXYWl0IGZvciBwZW5kaW5nIGZsaXBzIGJlZm9yZSBkcm1tb2RlX3NldF9tb2RlX21h am9yIGNhbGxzCi0JCSAqIGRybW1vZGVfY3J0Y191cGRhdGVfdGVhcl9mcmVlLCB0byBwcmV2ZW50 IGEgbmVzdGVkCi0JCSAqIGRybUhhbmRsZUV2ZW50IGNhbGwsIHdoaWNoIHdvdWxkIGhhbmcKLQkJ ICovCi0JCWFtZGdwdV9kcm1fd2FpdF9wZW5kaW5nX2ZsaXAoY3J0Yyk7CiAJCWRybW1vZGVfc2V0 X21vZGVfbWFqb3IoY3J0YywgJmNydGMtPm1vZGUsIGNydGMtPnJvdGF0aW9uLAogCQkJCSAgICAg ICBjcnRjLT54LCBjcnRjLT55KTsKIAl9CkBAIC0zODY0LDYgKzM4NjQsNyBAQCBCb29sIGFtZGdw dV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50LAogCWRybW1v ZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjb25maWctPmNydGNbMF0tPmRyaXZl cl9wcml2YXRlOwogCXVpbnQzMl90IGZsaXBfZmxhZ3MgPSBmbGlwX3N5bmMgPT0gRkxJUF9BU1lO QyA/IERSTV9NT0RFX1BBR0VfRkxJUF9BU1lOQyA6IDA7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIg ZmxpcGRhdGE7CisJQm9vbCBoYW5kbGVfZGVmZXJyZWQgPSBGQUxTRTsKIAl1aW50cHRyX3QgZHJt X3F1ZXVlX3NlcSA9IDA7CiAJc3RydWN0IGRybW1vZGVfZmIgKmZiOwogCWludCBpID0gMDsKQEAg LTM5NDYsNiArMzk0Nyw3IEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNj cm4sIENsaWVudFB0ciBjbGllbnQsCiAKIAkJCWlmIChkcm1tb2RlX2NydGMtPnNjYW5vdXRfdXBk YXRlX3BlbmRpbmcpIHsKIAkJCQlhbWRncHVfZHJtX3dhaXRfcGVuZGluZ19mbGlwKGNydGMpOwor CQkJCWhhbmRsZV9kZWZlcnJlZCA9IFRSVUU7CiAJCQkJYW1kZ3B1X2RybV9hYm9ydF9lbnRyeShk cm1tb2RlX2NydGMtPnNjYW5vdXRfdXBkYXRlX3BlbmRpbmcpOwogCQkJCWRybW1vZGVfY3J0Yy0+ c2Nhbm91dF91cGRhdGVfcGVuZGluZyA9IDA7CiAJCQl9CkBAIC0zOTgxLDYgKzM5ODMsOCBAQCBC b29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50 LAogCQlkcm1fcXVldWVfc2VxID0gMDsKIAl9CiAKKwlpZiAoaGFuZGxlX2RlZmVycmVkKQorCQlh bWRncHVfZHJtX3F1ZXVlX2hhbmRsZV9kZWZlcnJlZChyZWZfY3J0Yyk7CiAJaWYgKGZsaXBkYXRh LT5mbGlwX2NvdW50ID4gMCkKIAkJcmV0dXJuIFRSVUU7CiAKQEAgLTQwMDAsNSArNDAwNCw3IEBA IGVycm9yOgogCiAJeGY4NkRydk1zZyhzY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywgIlBhZ2Ug ZmxpcCBmYWlsZWQ6ICVzXG4iLAogCQkgICBzdHJlcnJvcihlcnJubykpOworCWlmIChoYW5kbGVf ZGVmZXJyZWQpCisJCWFtZGdwdV9kcm1fcXVldWVfaGFuZGxlX2RlZmVycmVkKHJlZl9jcnRjKTsK IAlyZXR1cm4gRkFMU0U7CiB9CmRpZmYgLS1naXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmggYi9z cmMvZHJtbW9kZV9kaXNwbGF5LmgKaW5kZXggNTYxOGM2YjQwLi4yNzYxMGQ1MzcgMTAwNjQ0Ci0t LSBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuaAorKysgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKQEAg LTExOSw2ICsxMTksMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCiAJLyogTW9kZXNldCBuZWVkZWQg Zm9yIERQTVMgb24gKi8KIAlCb29sIG5lZWRfbW9kZXNldDsKKwkvKiBGb3Iga2VlcGluZyB0cmFj ayBvZiBuZXN0ZWQgY2FsbHMgdG8gZHJtX3dhaXRfcGVuZGluZ19mbGlwIC8KKwkgKiBkcm1fcXVl dWVfaGFuZGxlX2RlZmVycmVkCisJICovCisJaW50IHdhaXRfZmxpcF9uZXN0aW5nX2xldmVsOwog CS8qIEEgZmxpcCB0byB0aGlzIEZCIGlzIHBlbmRpbmcgZm9yIHRoaXMgQ1JUQyAqLwogCXN0cnVj dCBkcm1tb2RlX2ZiICpmbGlwX3BlbmRpbmc7CiAJLyogVGhlIEZCIGN1cnJlbnRseSBiZWluZyBz Y2FubmVkIG91dCBieSB0aGlzIENSVEMsIGlmIGFueSAqLwotLSAKMi4xOC4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK