From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [mesa 8/9] glx/dri2: Move the wait after SwapBuffers into the next GetBuffers Date: Mon, 19 Jan 2015 11:00:44 +0000 Message-ID: <1421665245-5994-9-git-send-email-chris@chris-wilson.co.uk> References: <1421665245-5994-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1421665245-5994-1-git-send-email-chris-Y6uKTt2uX1cEflXRtASbqLVCufUGDwFn@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xorg-devel-bounces-go0+a7rfsptAfugRpC6u6w@public.gmane.org Sender: "xorg-devel" To: xorg-devel-go0+a7rfsptAfugRpC6u6w@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org QXMgdGhlIFNCQyBmcm9tIHRoZSByZXBseSBmcm9tIFN3YXBCdWZmZXJzIGlzIG5vdCB1c2VkIGlt bWVkaWF0ZWx5IGFuZApjYW4gYmUgZWFzaWx5IGRldGVybWluZWQgYnkgY291bnRpbmcgdGhlIG5l dyBvZiBTd2FwQnVmZmVycyByZXF1ZXN0cwptYWRlIGJ5IHRoZSBjbGllbnQsIHdlIGNhbiBkZWZl ciB0aGUgc3luY2hyb25pc2F0aW9uIHBvaW50IHRvIHRoZQpwZW5kaW5nIEdldEJ1ZmZlcnMgcm91 bmQgdHJpcC4gKFdlIGZvcmNlIHRoZSBpbnZhbGlkYXRpb24gZXZlbnQgaW4gb3JkZXIKdG8gcmVx dWlyZSB0aGUgR2V0QnVmZmVycyByb3VuZCB0cmlwIC0gd2Uga25vdyB0aGF0IGFsbCBYIHNlcnZl cnMgd2lsbApzZW5kIHRoZSBpbnZhbGlkYXRpb24gYWZ0ZXIgU3dhcEJ1ZmZlcnMgYW5kIHRoYXQg aW52YWxpZGF0aW9uIHdpbGwKYXJyaXZlIGJlZm9yZSB0aGUgU3dhcEJ1ZmZlcnMgcmVwbHksIHNv IG5vIGV4dHJhIHJvdW5kdHJpcHMgYXJlIGZvcmNlZC4pCgpBbiBpbXBvcnRhbnQgc2lkZS1lZmZl Y3QgaXMgZGVtb25zdHJhdGVkIGluIHRoZSBuZXh0IHBhdGNoIHdoZXJlIHdlIGNhbgpkZXRlY3Qg d2hlbiB0aGUgYnVmZmVycyBhcmUgc3RhbGUgYmVmb3JlIHF1ZXJ5aW5nIHByb3BlcnRpZXMuCgpT aWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0t CiBzcmMvZ2x4L2RyaTJfZ2x4LmMgfCA3MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzOCBpbnNlcnRpb25zKCsp LCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZ2x4L2RyaTJfZ2x4LmMgYi9zcmMv Z2x4L2RyaTJfZ2x4LmMKaW5kZXggNDYyZDU2MC4uMDU3NzgwNCAxMDA2NDQKLS0tIGEvc3JjL2ds eC9kcmkyX2dseC5jCisrKyBiL3NyYy9nbHgvZHJpMl9nbHguYwpAQCAtOTMsNiArOTMsMTAgQEAg c3RydWN0IGRyaTJfZHJhd2FibGUKICAgIGludCBoYXZlX2JhY2s7CiAgICBpbnQgaGF2ZV9mYWtl X2Zyb250OwogICAgaW50IHN3YXBfaW50ZXJ2YWw7CisgICBpbnQgc3dhcF9wZW5kaW5nOworCisg ICB4Y2JfZHJpMl9zd2FwX2J1ZmZlcnNfY29va2llX3Qgc3dhcF9idWZmZXJzX2Nvb2tpZTsKKyAg IGludDY0X3QgbGFzdF9zd2FwX3NiYzsKIAogICAgdWludDY0X3QgcHJldmlvdXNfdGltZTsKICAg IHVuc2lnbmVkIGZyYW1lczsKQEAgLTc3OCw1MCArNzgyLDUxIEBAIHN0YXRpYyB2b2lkIHNob3df ZnBzKHN0cnVjdCBkcmkyX2RyYXdhYmxlICpkcmF3KQogICAgfQogfQogCi1zdGF0aWMgaW50NjRf dAotZHJpMlhjYlN3YXBCdWZmZXJzKERpc3BsYXkgKmRweSwKLSAgICAgICAgICAgICAgICAgIF9f R0xYRFJJZHJhd2FibGUgKnBkcmF3LAorc3RhdGljIHZvaWQKK2RyaTJYY2JTd2FwQnVmZmVycyhz dHJ1Y3QgZHJpMl9kcmF3YWJsZSAqcHJpdiwKICAgICAgICAgICAgICAgICAgIGludDY0X3QgdGFy Z2V0X21zYywKICAgICAgICAgICAgICAgICAgIGludDY0X3QgZGl2aXNvciwKICAgICAgICAgICAg ICAgICAgIGludDY0X3QgcmVtYWluZGVyKQogewotICAgeGNiX2RyaTJfc3dhcF9idWZmZXJzX2Nv b2tpZV90IHN3YXBfYnVmZmVyc19jb29raWU7Ci0gICB4Y2JfZHJpMl9zd2FwX2J1ZmZlcnNfcmVw bHlfdCAqc3dhcF9idWZmZXJzX3JlcGx5OworICAgeGNiX2Nvbm5lY3Rpb25fdCAqYyA9IFhHZXRY Q0JDb25uZWN0aW9uKHByaXYtPmJhc2UucHNjLT5kcHkpOwogICAgdWludDMyX3QgdGFyZ2V0X21z Y19oaSwgdGFyZ2V0X21zY19sbzsKICAgIHVpbnQzMl90IGRpdmlzb3JfaGksIGRpdmlzb3JfbG87 CiAgICB1aW50MzJfdCByZW1haW5kZXJfaGksIHJlbWFpbmRlcl9sbzsKLSAgIGludDY0X3QgcmV0 ID0gMDsKLSAgIHhjYl9jb25uZWN0aW9uX3QgKmMgPSBYR2V0WENCQ29ubmVjdGlvbihkcHkpOwog CiAgICBzcGxpdF9jb3VudGVyKHRhcmdldF9tc2MsICZ0YXJnZXRfbXNjX2hpLCAmdGFyZ2V0X21z Y19sbyk7CiAgICBzcGxpdF9jb3VudGVyKGRpdmlzb3IsICZkaXZpc29yX2hpLCAmZGl2aXNvcl9s byk7CiAgICBzcGxpdF9jb3VudGVyKHJlbWFpbmRlciwgJnJlbWFpbmRlcl9oaSwgJnJlbWFpbmRl cl9sbyk7CiAKLSAgIHN3YXBfYnVmZmVyc19jb29raWUgPQotICAgICAgeGNiX2RyaTJfc3dhcF9i dWZmZXJzX3VuY2hlY2tlZChjLCBwZHJhdy0+eERyYXdhYmxlLAorICAgcHJpdi0+c3dhcF9idWZm ZXJzX2Nvb2tpZSA9CisgICAgICB4Y2JfZHJpMl9zd2FwX2J1ZmZlcnNfdW5jaGVja2VkKGMsIHBy aXYtPmJhc2UueERyYXdhYmxlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0YXJnZXRfbXNjX2hpLCB0YXJnZXRfbXNjX2xvLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkaXZpc29yX2hpLCBkaXZpc29yX2xvLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZW1haW5kZXJfaGksIHJlbWFpbmRlcl9sbyk7CisgICB4Y2Jf Zmx1c2goYyk7CisgICBwcml2LT5zd2FwX3BlbmRpbmcrKzsKIAotICAgLyogSW1tZWRpYXRlbHkg d2FpdCBvbiB0aGUgc3dhcGJ1ZmZlcnMgcmVwbHkuICBJZiB3ZSBkaWRuJ3QsIHdlJ2QgaGF2ZQot ICAgICogdG8gZG8gc28gc29tZSB0aW1lIGJlZm9yZSByZXVzaW5nIGEgKG5vbi1wYWdlZmxpcHBl ZCkgYmFja2J1ZmZlci4KLSAgICAqIE90aGVyd2lzZSwgdGhlIG5ldyByZW5kZXJpbmcgY291bGQg Z2V0IGFoZWFkIG9mIHRoZSBYIFNlcnZlcidzCi0gICAgKiBkaXNwYXRjaCBvZiB0aGUgc3dhcGJ1 ZmZlciBhbmQgeW91J2QgZGlzcGxheSBnYXJiYWdlLgotICAgICoKLSAgICAqIFdlIHVzZSBYU3lu YygpIGZpcnN0IHRvIHJlYXAgdGhlIGludmFsaWRhdGUgZXZlbnRzIHRocm91Z2ggdGhlIGV2ZW50 Ci0gICAgKiBmaWx0ZXIsIHRvIGVuc3VyZSB0aGF0IHRoZSBuZXh0IGRyYXdpbmcgZG9lc24ndCB1 c2UgYW4gaW52YWxpZGF0ZWQKLSAgICAqIGJ1ZmZlci4KLSAgICAqLwotICAgWFN5bmMoZHB5LCBG YWxzZSk7CisgICAvKiBGb3JjZSBhIHN5bmNocm9ub3VzIGNvbXBsZXRpb24gcHJpb3IgdG8gdGhl IG5leHQgcmVuZGVyaW5nICovCisgICBkcmkySW52YWxpZGF0ZUJ1ZmZlcnMocHJpdi0+YmFzZS5w c2MtPmRweSwgcHJpdi0+YmFzZS54RHJhd2FibGUpOworfQorCitzdGF0aWMgdm9pZCBkcmkyWGNi U3dhcEJ1ZmZlcnNDb21wbGV0ZShzdHJ1Y3QgZHJpMl9kcmF3YWJsZSAqcHJpdikKK3sKKyAgIHhj Yl9kcmkyX3N3YXBfYnVmZmVyc19yZXBseV90ICpzd2FwX2J1ZmZlcnNfcmVwbHk7CisKKyAgIGlm ICghcHJpdi0+c3dhcF9wZW5kaW5nKQorICAgICAgcmV0dXJuOworCisgICBwcml2LT5zd2FwX3Bl bmRpbmcgPSAwOwogCiAgICBzd2FwX2J1ZmZlcnNfcmVwbHkgPQotICAgICAgeGNiX2RyaTJfc3dh cF9idWZmZXJzX3JlcGx5KGMsIHN3YXBfYnVmZmVyc19jb29raWUsIE5VTEwpOwotICAgaWYgKHN3 YXBfYnVmZmVyc19yZXBseSkgewotICAgICAgcmV0ID0gbWVyZ2VfY291bnRlcihzd2FwX2J1ZmZl cnNfcmVwbHktPnN3YXBfaGksCi0gICAgICAgICAgICAgICAgICAgICAgICAgIHN3YXBfYnVmZmVy c19yZXBseS0+c3dhcF9sbyk7Ci0gICAgICBmcmVlKHN3YXBfYnVmZmVyc19yZXBseSk7Ci0gICB9 Ci0gICByZXR1cm4gcmV0OworICAgICAgICB4Y2JfZHJpMl9zd2FwX2J1ZmZlcnNfcmVwbHkoWEdl dFhDQkNvbm5lY3Rpb24ocHJpdi0+YmFzZS5wc2MtPmRweSksCisJCQkJICAgIHByaXYtPnN3YXBf YnVmZmVyc19jb29raWUsIE5VTEwpOworICAgaWYgKHN3YXBfYnVmZmVyc19yZXBseSA9PSBOVUxM KQorICAgICAgcmV0dXJuOworCisgICBwcml2LT5sYXN0X3N3YXBfc2JjID0gbWVyZ2VfY291bnRl cihzd2FwX2J1ZmZlcnNfcmVwbHktPnN3YXBfaGksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzd2FwX2J1ZmZlcnNfcmVwbHktPnN3YXBfbG8pOworICAgZnJlZShzd2Fw X2J1ZmZlcnNfcmVwbHkpOwogfQogCiBzdGF0aWMgaW50NjRfdApAQCAtODMzLDExICs4MzgsMTAg QEAgZHJpMlN3YXBCdWZmZXJzKF9fR0xYRFJJZHJhd2FibGUgKnBkcmF3LCBpbnQ2NF90IHRhcmdl dF9tc2MsIGludDY0X3QgZGl2aXNvciwKICAgICBzdHJ1Y3QgZHJpMl9zY3JlZW4gKnBzYyA9IChz dHJ1Y3QgZHJpMl9zY3JlZW4gKikgcHJpdi0+YmFzZS5wc2M7CiAgICAgc3RydWN0IGRyaTJfZGlz cGxheSAqcGRwID0KIAkoc3RydWN0IGRyaTJfZGlzcGxheSAqKWRweVByaXYtPmRyaTJEaXNwbGF5 OwotICAgIGludDY0X3QgcmV0ID0gMDsKIAogICAgIC8qIENoZWNrIHdlIGhhdmUgdGhlIHJpZ2h0 IGF0dGFjaG1lbnRzICovCiAgICAgaWYgKCFwcml2LT5oYXZlX2JhY2spCi0JcmV0dXJuIHJldDsK KwlyZXR1cm4gMDsKIAogICAgIC8qIE9sZCBzZXJ2ZXJzIGNhbid0IGhhbmRsZSBzd2FwYnVmZmVy cyAqLwogICAgIGlmICghcGRwLT5zd2FwQXZhaWxhYmxlKSB7CkBAIC04NTAsMTkgKzg1NCwxNCBA QCBkcmkyU3dhcEJ1ZmZlcnMoX19HTFhEUklkcmF3YWJsZSAqcGRyYXcsIGludDY0X3QgdGFyZ2V0 X21zYywgaW50NjRfdCBkaXZpc29yLAogICAgICAgICAgIGZsYWdzIHw9IF9fRFJJMl9GTFVTSF9D T05URVhUOwogICAgICAgIGRyaTJGbHVzaChwc2MsIGN0eCwgcHJpdiwgZmxhZ3MsIF9fRFJJMl9U SFJPVFRMRV9TV0FQQlVGRkVSKTsKIAotICAgICAgIHJldCA9IGRyaTJYY2JTd2FwQnVmZmVycyhw ZHJhdy0+cHNjLT5kcHksIHBkcmF3LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 YXJnZXRfbXNjLCBkaXZpc29yLCByZW1haW5kZXIpOworICAgICAgIGRyaTJYY2JTd2FwQnVmZmVy cyhwcml2LCB0YXJnZXRfbXNjLCBkaXZpc29yLCByZW1haW5kZXIpOwogICAgIH0KIAogICAgIGlm IChwc2MtPnNob3dfZnBzX2ludGVydmFsKSB7CiAgICAgICAgc2hvd19mcHMocHJpdik7CiAgICAg fQogCi0gICAgLyogT2xkIHNlcnZlcnMgZG9uJ3Qgc2VuZCBpbnZhbGlkYXRlIGV2ZW50cyAqLwot ICAgIGlmICghcGRwLT5pbnZhbGlkYXRlQXZhaWxhYmxlKQotICAgICAgIGRyaTJJbnZhbGlkYXRl QnVmZmVycyhkcHlQcml2LT5kcHksIHBkcmF3LT54RHJhd2FibGUpOwotCi0gICAgcmV0dXJuIHJl dDsKKyAgICByZXR1cm4gcHJpdi0+bGFzdF9zd2FwX3NiYyArIHByaXYtPnN3YXBfcGVuZGluZzsK IH0KIAogc3RhdGljIF9fRFJJYnVmZmVyICoKQEAgLTg4NSw2ICs4ODQsOCBAQCBkcmkyR2V0QnVm ZmVycyhfX0RSSWRyYXdhYmxlICogZHJpRHJhd2FibGUsCiAKICAgIGZyZWUoYnVmZmVycyk7CiAK KyAgIGRyaTJYY2JTd2FwQnVmZmVyc0NvbXBsZXRlKHBkcmF3KTsKKwogICAgcmV0dXJuIHBkcmF3 LT5idWZmZXJzOwogfQogCkBAIC05MTAsNiArOTExLDggQEAgZHJpMkdldEJ1ZmZlcnNXaXRoRm9y bWF0KF9fRFJJZHJhd2FibGUgKiBkcmlEcmF3YWJsZSwKIAogICAgZnJlZShidWZmZXJzKTsKIAor ICAgZHJpMlhjYlN3YXBCdWZmZXJzQ29tcGxldGUocGRyYXcpOworCiAgICByZXR1cm4gcGRyYXct PmJ1ZmZlcnM7CiB9CiAKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwp4b3JnLWRldmVsQGxpc3RzLngub3JnOiBYLk9yZyBkZXZlbG9wbWVu dApBcmNoaXZlczogaHR0cDovL2xpc3RzLngub3JnL2FyY2hpdmVzL3hvcmctZGV2ZWwKSW5mbzog aHR0cDovL2xpc3RzLngub3JnL21haWxtYW4vbGlzdGluZm8veG9yZy1kZXZlbA==