From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH 2/5] drm: Keep track of last vblank sequence waited for per-file-descriptor Date: Fri, 10 Jun 2016 17:57:10 +0900 Message-ID: <1465549033-16561-3-git-send-email-michel@daenzer.net> References: <1465549033-16561-1-git-send-email-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.gna.ch (darkcity.gna.ch [195.226.6.51]) by gabe.freedesktop.org (Postfix) with ESMTP id DA3CF6ECBC for ; Fri, 10 Jun 2016 08:57:21 +0000 (UTC) In-Reply-To: <1465549033-16561-1-git-send-email-michel@daenzer.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpUaGUgcGVyLWRl dmljZSB0cmFja2luZyBoYXNuJ3QgYmVlbiB1c2VkIHNpbmNlIGNvbW1pdCBkYWZmZmRhMAooImRy bS9pbmZvOiBSZW1vdmUgdW51c2VkIGNvZGUiKS4KClRoZSBwZXItZmlsZS1kZXNjcmlwdG9yIHRy YWNraW5nIHdpbGwgYmUgdXNlZCBieSBhIGZvbGxvd2luZyBhbWRncHUKZHJpdmVyIGNoYW5nZS4K Ck5vdGUgdGhhdCBsYXN0X3ZibGFua193YWl0IGlzIG9ubHkgdXBkYXRlZCB3aGVuIHRoZSBjb3Jy ZXNwb25kaW5nIHdhaXQKY29tcGxldGVzLCBhbmQgaXMgc2V0IHRvIHRoZSB2Ymxhbmsgc2Vxbm8g d2FpdGVkIGZvciwgbm90IHRoZSBjdXJyZW50Cm9uZSB3aGVuIHRoZSB3YWl0IGNvbXBsZXRlcy4K ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jIHwgIDggKysrKysrKysKIGRyaXZlcnMvZ3B1 L2RybS9kcm1faXJxLmMgIHwgMTggKysrKysrKysrKysrKysrKystCiBpbmNsdWRlL2RybS9kcm1Q LmggICAgICAgICB8ICA0ICsrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwg MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZvcHMuYyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCmluZGV4IDdhZjdmOGIuLjFmNTJmMDIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZm9wcy5jCkBAIC0yNTYsNiArMjU2LDEzIEBAIHN0YXRpYyBpbnQgZHJtX29wZW5faGVscGVy KHN0cnVjdCBmaWxlICpmaWxwLCBzdHJ1Y3QgZHJtX21pbm9yICptaW5vcikKIAlwcml2LT5waWQg PSBnZXRfcGlkKHRhc2tfcGlkKGN1cnJlbnQpKTsKIAlwcml2LT5taW5vciA9IG1pbm9yOwogCisJ aWYgKGRybV9pc19wcmltYXJ5X2NsaWVudChwcml2KSkgeworCQlwcml2LT5udW1fY3J0Y3MgPSBk ZXYtPm51bV9jcnRjczsKKwkJcHJpdi0+bGFzdF92Ymxhbmtfd2FpdCA9IGtjYWxsb2MocHJpdi0+ bnVtX2NydGNzLAorCQkJCQkJIHNpemVvZigqcHJpdi0+bGFzdF92Ymxhbmtfd2FpdCksCisJCQkJ CQkgR0ZQX0tFUk5FTCk7CisJfQorCiAJLyogZm9yIGNvbXBhdGliaWxpdHkgcm9vdCBpcyBhbHdh eXMgYXV0aGVudGljYXRlZCAqLwogCXByaXYtPmF1dGhlbnRpY2F0ZWQgPSBjYXBhYmxlKENBUF9T WVNfQURNSU4pOwogCXByaXYtPmxvY2tfY291bnQgPSAwOwpAQCAtNTMwLDYgKzUzNyw3IEBAIGlu dCBkcm1fcmVsZWFzZShzdHJ1Y3QgaW5vZGUgKmlub2RlLCBzdHJ1Y3QgZmlsZSAqZmlscCkKIAlX QVJOX09OKCFsaXN0X2VtcHR5KCZmaWxlX3ByaXYtPmV2ZW50X2xpc3QpKTsKIAogCXB1dF9waWQo ZmlsZV9wcml2LT5waWQpOworCWtmcmVlKGZpbGVfcHJpdi0+bGFzdF92Ymxhbmtfd2FpdCk7CiAJ a2ZyZWUoZmlsZV9wcml2KTsKIAogCS8qID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9pcnEuYwppbmRleCAzOWVhNGZjLi42Mjg0NWY0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1faXJxLmMKQEAgLTc3LDYgKzc3LDE1IEBAIE1PRFVMRV9QQVJNX0RFU0ModmJsYW5r b2ZmZGVsYXksICJEZWxheSB1bnRpbCB2YmxhbmsgaXJxIGF1dG8tZGlzYWJsZSBbbXNlY3NdICgw CiBNT0RVTEVfUEFSTV9ERVNDKHRpbWVzdGFtcF9wcmVjaXNpb25fdXNlYywgIk1heC4gZXJyb3Ig b24gdGltZXN0YW1wcyBbdXNlY3NdIik7CiBNT0RVTEVfUEFSTV9ERVNDKHRpbWVzdGFtcF9tb25v dG9uaWMsICJVc2UgbW9ub3RvbmljIHRpbWVzdGFtcHMiKTsKIAorLyogS2VlcCB0cmFjayBvZiB0 aGUgbGF0ZXN0IHNlcW5vIHdhaXRlZCBmb3IgYnkgdGhpcyBmaWxlIGRlc2NyaXB0b3IgKi8KK3N0 YXRpYyB2b2lkIHVwZGF0ZV9sYXN0X3ZibGFua193YWl0KHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9w cml2LCB1bnNpZ25lZCBwaXBlLAorCQkJCSAgICB1MzIgc2VxKQoreworCWlmIChwaXBlIDwgZmls ZV9wcml2LT5udW1fY3J0Y3MgJiYKKwkgICAgKGludCkoc2VxIC0gZmlsZV9wcml2LT5sYXN0X3Zi bGFua193YWl0W3BpcGVdKSA+IDApCisJCWZpbGVfcHJpdi0+bGFzdF92Ymxhbmtfd2FpdFtwaXBl XSA9IHNlcTsKK30KKwogc3RhdGljIHZvaWQgc3RvcmVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCQkJIHUzMiB2YmxhbmtfY291bnRfaW5jLAogCQkJ IHN0cnVjdCB0aW1ldmFsICp0X3ZibGFuaywgdTMyIGxhc3QpCkBAIC0xNjk0LDYgKzE3MDMsOSBA QCBzdGF0aWMgaW50IGRybV9xdWV1ZV92YmxhbmtfZXZlbnQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdW5zaWduZWQgaW50IHBpcGUsCiAJZS0+ZXZlbnQuc2VxdWVuY2UgPSB2Ymx3YWl0LT5yZXF1 ZXN0LnNlcXVlbmNlOwogCWlmICgoc2VxIC0gdmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5jZSkgPD0g KDEgPDwgMjMpKSB7CiAJCWRybV92YmxhbmtfcHV0KGRldiwgcGlwZSk7CisKKwkJdXBkYXRlX2xh c3RfdmJsYW5rX3dhaXQoZmlsZV9wcml2LCBwaXBlLAorCQkJCQl2Ymx3YWl0LT5yZXF1ZXN0LnNl cXVlbmNlKTsKIAkJc2VuZF92YmxhbmtfZXZlbnQoZGV2LCBlLCBzZXEsICZub3cpOwogCQl2Ymx3 YWl0LT5yZXBseS5zZXF1ZW5jZSA9IHNlcTsKIAl9IGVsc2UgewpAQCAtMTc5NSw3ICsxODA3LDYg QEAgaW50IGRybV93YWl0X3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCiAJRFJNX0RFQlVHKCJ3YWl0aW5nIG9uIHZibGFuayBjb3VudCAlZCwgY3J0YyAldVxuIiwK IAkJICB2Ymx3YWl0LT5yZXF1ZXN0LnNlcXVlbmNlLCBwaXBlKTsKLQl2YmxhbmstPmxhc3Rfd2Fp dCA9IHZibHdhaXQtPnJlcXVlc3Quc2VxdWVuY2U7CiAJRFJNX1dBSVRfT04ocmV0LCB2Ymxhbmst PnF1ZXVlLCAzICogSFosCiAJCSAgICAoKChkcm1fdmJsYW5rX2NvdW50KGRldiwgcGlwZSkgLQog CQkgICAgICAgdmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5jZSkgPD0gKDEgPDwgMjMpKSB8fApAQCAt MTgwNSw2ICsxODE2LDkgQEAgaW50IGRybV93YWl0X3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLAogCWlmIChyZXQgIT0gLUVJTlRSKSB7CiAJCXN0cnVjdCB0aW1ldmFs IG5vdzsKIAorCQl1cGRhdGVfbGFzdF92Ymxhbmtfd2FpdChmaWxlX3ByaXYsIHBpcGUsCisJCQkJ CXZibHdhaXQtPnJlcXVlc3Quc2VxdWVuY2UpOworCiAJCXZibHdhaXQtPnJlcGx5LnNlcXVlbmNl ID0gZHJtX3ZibGFua19jb3VudF9hbmRfdGltZShkZXYsIHBpcGUsICZub3cpOwogCQl2Ymx3YWl0 LT5yZXBseS50dmFsX3NlYyA9IG5vdy50dl9zZWM7CiAJCXZibHdhaXQtPnJlcGx5LnR2YWxfdXNl YyA9IG5vdy50dl91c2VjOwpAQCAtMTg0MSw2ICsxODU1LDggQEAgc3RhdGljIHZvaWQgZHJtX2hh bmRsZV92YmxhbmtfZXZlbnRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBw aXBlKQogCiAJCWxpc3RfZGVsKCZlLT5iYXNlLmxpbmspOwogCQlkcm1fdmJsYW5rX3B1dChkZXYs IHBpcGUpOworCQl1cGRhdGVfbGFzdF92Ymxhbmtfd2FpdChlLT5iYXNlLmZpbGVfcHJpdiwgcGlw ZSwKKwkJCQkJZS0+ZXZlbnQuc2VxdWVuY2UpOwogCQlzZW5kX3ZibGFua19ldmVudChkZXYsIGUs IHNlcSwgJm5vdyk7CiAJfQogCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1QLmggYi9pbmNs dWRlL2RybS9kcm1QLmgKaW5kZXggMzYwYjJhNy4uZDdjOTViNiAxMDA2NDQKLS0tIGEvaW5jbHVk ZS9kcm0vZHJtUC5oCisrKyBiL2luY2x1ZGUvZHJtL2RybVAuaApAQCAtMzU0LDYgKzM1NCw5IEBA IHN0cnVjdCBkcm1fZmlsZSB7CiAJc3RydWN0IG11dGV4IGV2ZW50X3JlYWRfbG9jazsKIAogCXN0 cnVjdCBkcm1fcHJpbWVfZmlsZV9wcml2YXRlIHByaW1lOworCisJdW5zaWduZWQgbnVtX2NydGNz OworCXUzMiAqbGFzdF92Ymxhbmtfd2FpdDsJCS8qIExhc3QgdmJsYW5rIHNlcW5vIHdhaXRlZCBw ZXIgQ1JUQyAqLwogfTsKIAogLyoqCkBAIC03MzMsNyArNzM2LDYgQEAgc3RydWN0IGRybV92Ymxh bmtfY3J0YyB7CiAJYXRvbWljX3QgcmVmY291bnQ7CQkvKiBudW1iZXIgb2YgdXNlcnMgb2YgdmJs YW5rIGludGVycnVwdHNwZXIgY3J0YyAqLwogCXUzMiBsYXN0OwkJCS8qIHByb3RlY3RlZCBieSBk ZXYtPnZibF9sb2NrLCB1c2VkICovCiAJCQkJCS8qIGZvciB3cmFwYXJvdW5kIGhhbmRsaW5nICov Ci0JdTMyIGxhc3Rfd2FpdDsJCQkvKiBMYXN0IHZibGFuayBzZXFubyB3YWl0ZWQgcGVyIENSVEMg Ki8KIAl1bnNpZ25lZCBpbnQgaW5tb2Rlc2V0OwkJLyogRGlzcGxheSBkcml2ZXIgaXMgc2V0dGlu ZyBtb2RlICovCiAJdW5zaWduZWQgaW50IHBpcGU7CQkvKiBjcnRjIGluZGV4ICovCiAJaW50IGZy YW1lZHVyX25zOwkJLyogZnJhbWUvZmllbGQgZHVyYXRpb24gaW4gbnMgKi8KLS0gCjIuOC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK