From: Abdiel Janulgue Subject: [i-g-t PATCH v8 3/5] igt/gem_wait: Use new igt_spin_batch Date: Mon, 21 Nov 2016 11:25:09 +0200 Message-ID: <1479720311-1840-4-git-send-email-abdiel.janulgue@linux.intel.com> References: <1479720311-1840-1-git-send-email-abdiel.janulgue@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC7286E3C5 for ; Mon, 21 Nov 2016 09:24:52 +0000 (UTC) In-Reply-To: <1479720311-1840-1-git-send-email-abdiel.janulgue@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org djc6IEFkYXB0IHRvIGFwaSByZW5hbWUKdjg6IFJlc3RvcmUgc2FuaXR5Y2hlY2sgd2FpdCBvbiB0 aGUgcmVjdXJzaXZlIGJhdGNoIGFuZAogICAgYXZvaWQgdXNpbmcgQzk5IGxvY2FscyAoQ2hyaXMg V2lsc29uKQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogQWJk aWVsIEphbnVsZ3VlIDxhYmRpZWwuamFudWxndWVAbGludXguaW50ZWwuY29tPgotLS0KIHRlc3Rz L2dlbV93YWl0LmMgfCAxMjggKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgMTIwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV93YWl0LmMgYi90ZXN0cy9nZW1fd2Fp dC5jCmluZGV4IGI0MTI3ZGUuLjYzMzJlNzYgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV93YWl0LmMK KysrIGIvdGVzdHMvZ2VtX3dhaXQuYwpAQCAtMjcsMTggKzI3LDYgQEAKIAogI2luY2x1ZGUgImln dC5oIgogCi0jaW5jbHVkZSA8c2lnbmFsLmg+Ci0jaW5jbHVkZSA8dGltZS5oPgotI2luY2x1ZGUg PHN5cy9zeXNjYWxsLmg+Ci0KLSNkZWZpbmUgZ2V0dGlkKCkgc3lzY2FsbChfX05SX2dldHRpZCkK LSNkZWZpbmUgc2lnZXZfbm90aWZ5X3RocmVhZF9pZCBfc2lnZXZfdW4uX3RpZAotCi0jZGVmaW5l IExPQ0FMX0k5MTVfRVhFQ19CU0RfU0hJRlQgICAgICAoMTMpCi0jZGVmaW5lIExPQ0FMX0k5MTVf RVhFQ19CU0RfTUFTSyAgICAgICAoMyA8PCBMT0NBTF9JOTE1X0VYRUNfQlNEX1NISUZUKQotCi0j ZGVmaW5lIEVOR0lORV9NQVNLICAoSTkxNV9FWEVDX1JJTkdfTUFTSyB8IExPQ0FMX0k5MTVfRVhF Q19CU0RfTUFTSykKLQogc3RhdGljIGludCBfX2dlbV93YWl0KGludCBmZCwgc3RydWN0IGRybV9p OTE1X2dlbV93YWl0ICp3KQogewogCWludCBlcnI7CkBAIC03NSwxMjkgKzYzLDMzIEBAIHN0YXRp YyB2b2lkIGludmFsaWRfYnVmKGludCBmZCkKIAlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX3dhaXQoZmQs ICZ3YWl0KSwgLUVOT0VOVCk7CiB9CiAKLXN0YXRpYyB1aW50MzJfdCAqYmF0Y2g7Ci0KLXN0YXRp YyB2b2lkIHNpZ2l0ZXIoaW50IHNpZywgc2lnaW5mb190ICppbmZvLCB2b2lkICphcmcpCi17Ci0J KmJhdGNoID0gTUlfQkFUQ0hfQlVGRkVSX0VORDsKLQlfX3N5bmNfc3luY2hyb25pemUoKTsKLX0K LQotI2RlZmluZSBNU0VDX1BFUl9TRUMgKDEwMDApCi0jZGVmaW5lIFVTRUNfUEVSX1NFQyAoMTAw MCAqIE1TRUNfUEVSX1NFQykKLSNkZWZpbmUgTlNFQ19QRVJfU0VDICgxMDAwICogVVNFQ19QRVJf U0VDKQotCiAjZGVmaW5lIEJVU1kgMQogI2RlZmluZSBIQU5HIDIKIHN0YXRpYyB2b2lkIGJhc2lj KGludCBmZCwgdW5zaWduZWQgZW5naW5lLCB1bnNpZ25lZCBmbGFncykKIHsKLQljb25zdCBpbnQg Z2VuID0gaW50ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2aWQoZmQpKTsKLQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2V4ZWNfb2JqZWN0MiBvYmo7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9u X2VudHJ5IHJlbG9jOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgZXhlY2J1ZjsK IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3dhaXQgd2FpdDsKLQl1bnNpZ25lZCBlbmdpbmVzWzE2XTsK LQl1bnNpZ25lZCBuZW5naW5lOwotCWludCBpLCB0aW1lb3V0OwotCi0JbmVuZ2luZSA9IDA7Ci0J aWYgKGVuZ2luZSA9PSAtMSkgewotCQlmb3JfZWFjaF9lbmdpbmUoZmQsIGVuZ2luZSkKLQkJCWlm IChlbmdpbmUpIGVuZ2luZXNbbmVuZ2luZSsrXSA9IGVuZ2luZTsKLQl9IGVsc2UgewotCQlpZ3Rf cmVxdWlyZShnZW1faGFzX3JpbmcoZmQsIGVuZ2luZSkpOwotCQllbmdpbmVzW25lbmdpbmUrK10g PSBlbmdpbmU7Ci0JfQotCWlndF9yZXF1aXJlKG5lbmdpbmUpOwotCi0JbWVtc2V0KCZleGVjYnVm LCAwLCBzaXplb2YoZXhlY2J1ZikpOwotCWV4ZWNidWYuYnVmZmVyc19wdHIgPSAodWludHB0cl90 KSZvYmo7Ci0JZXhlY2J1Zi5idWZmZXJfY291bnQgPSAxOwotCi0JbWVtc2V0KCZvYmosIDAsIHNp emVvZihvYmopKTsKLQlvYmouaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7Ci0KLQlvYmou cmVsb2NzX3B0ciA9ICh1aW50cHRyX3QpJnJlbG9jOwotCW9iai5yZWxvY2F0aW9uX2NvdW50ID0g MTsKLQltZW1zZXQoJnJlbG9jLCAwLCBzaXplb2YocmVsb2MpKTsKLQotCWJhdGNoID0gZ2VtX21t YXBfX2d0dChmZCwgb2JqLmhhbmRsZSwgNDA5NiwgUFJPVF9XUklURSk7Ci0JZ2VtX3NldF9kb21h aW4oZmQsIG9iai5oYW5kbGUsCi0JCQlJOTE1X0dFTV9ET01BSU5fR1RULCBJOTE1X0dFTV9ET01B SU5fR1RUKTsKLQotCXJlbG9jLnRhcmdldF9oYW5kbGUgPSBvYmouaGFuZGxlOyAvKiByZWN1cnNl ICovCi0JcmVsb2MucHJlc3VtZWRfb2Zmc2V0ID0gMDsKLQlyZWxvYy5vZmZzZXQgPSBzaXplb2Yo dWludDMyX3QpOwotCXJlbG9jLmRlbHRhID0gMDsKLQlyZWxvYy5yZWFkX2RvbWFpbnMgPSBJOTE1 X0dFTV9ET01BSU5fQ09NTUFORDsKLQlyZWxvYy53cml0ZV9kb21haW4gPSAwOwotCi0JaSA9IDA7 Ci0JYmF0Y2hbaV0gPSBNSV9CQVRDSF9CVUZGRVJfU1RBUlQ7Ci0JaWYgKGdlbiA+PSA4KSB7Ci0J CWJhdGNoW2ldIHw9IDEgPDwgOCB8IDE7Ci0JCWJhdGNoWysraV0gPSAwOwotCQliYXRjaFsrK2ld ID0gMDsKLQl9IGVsc2UgaWYgKGdlbiA+PSA2KSB7Ci0JCWJhdGNoW2ldIHw9IDEgPDwgODsKLQkJ YmF0Y2hbKytpXSA9IDA7Ci0JfSBlbHNlIHsKLQkJYmF0Y2hbaV0gfD0gMiA8PCA2OwotCQliYXRj aFsrK2ldID0gMDsKLQkJaWYgKGdlbiA8IDQpIHsKLQkJCWJhdGNoW2ldIHw9IDE7Ci0JCQlyZWxv Yy5kZWx0YSA9IDE7Ci0JCX0KLQl9CisJaWd0X3NwaW5fdCAqc3BpbjsKKwlpbnQgdGltZW91dDsK KwlpbnQgd2FpdF9zID0gKGZsYWdzID09IDApID8gTlNFQ19QRVJfU0VDIDogMDsKIAotCWZvciAo aSA9IDA7IGkgPCBuZW5naW5lOyBpKyspIHsKLQkJZXhlY2J1Zi5mbGFncyAmPSB+RU5HSU5FX01B U0s7Ci0JCWV4ZWNidWYuZmxhZ3MgfD0gZW5naW5lc1tpXTsKLQkJZ2VtX2V4ZWNidWYoZmQsICZl eGVjYnVmKTsKLQl9CisJd2FpdF9zID0gKChmbGFncyAmIEhBTkcpID09IDApID8gd2FpdF9zIDog LTE7CisJc3BpbiA9IGlndF9zcGluX2JhdGNoX25ldyhmZCwgd2FpdF9zLCBlbmdpbmUsIDApOwog CiAJbWVtc2V0KCZ3YWl0LCAwLCBzaXplb2Yod2FpdCkpOwotCXdhaXQuYm9faGFuZGxlID0gb2Jq LmhhbmRsZTsKKwl3YWl0LmJvX2hhbmRsZSA9IHNwaW4tPmhhbmRsZTsKIAlpZ3RfYXNzZXJ0X2Vx KF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSwgLUVUSU1FKTsKIAogCWlmIChmbGFncyAmIEJVU1kpIHsK IAkJc3RydWN0IHRpbWVzcGVjIHR2OwogCiAJCXRpbWVvdXQgPSAxMjA7Ci0JCWlmICgoZmxhZ3Mg JiBIQU5HKSA9PSAwKSB7Ci0JCQkqYmF0Y2ggPSBNSV9CQVRDSF9CVUZGRVJfRU5EOwotCQkJX19z eW5jX3N5bmNocm9uaXplKCk7CisJCWlmICgoZmxhZ3MgJiBIQU5HKSA9PSAwKQogCQkJdGltZW91 dCA9IDE7Ci0JCX0KIAogCQltZW1zZXQoJnR2LCAwLCBzaXplb2YodHYpKTsKIAkJd2hpbGUgKF9f Z2VtX3dhaXQoZmQsICZ3YWl0KSA9PSAtRVRJTUUpCiAJCQlpZ3RfYXNzZXJ0KGlndF9zZWNvbmRz X2VsYXBzZWQoJnR2KSA8IHRpbWVvdXQpOwogCX0gZWxzZSB7Ci0JCXRpbWVyX3QgdGltZXI7Ci0K LQkJaWYgKChmbGFncyAmIEhBTkcpID09IDApIHsKLQkJCXN0cnVjdCBzaWdldmVudCBzZXY7Ci0J CQlzdHJ1Y3Qgc2lnYWN0aW9uIGFjdDsKLQkJCXN0cnVjdCBpdGltZXJzcGVjIGl0czsKLQotCQkJ bWVtc2V0KCZzZXYsIDAsIHNpemVvZihzZXYpKTsKLQkJCXNldi5zaWdldl9ub3RpZnkgPSBTSUdF Vl9TSUdOQUwgfCBTSUdFVl9USFJFQURfSUQ7Ci0JCQlzZXYuc2lnZXZfbm90aWZ5X3RocmVhZF9p ZCA9IGdldHRpZCgpOwotCQkJc2V2LnNpZ2V2X3NpZ25vID0gU0lHUlRNSU4gKyAxOwotCQkJaWd0 X2Fzc2VydCh0aW1lcl9jcmVhdGUoQ0xPQ0tfTU9OT1RPTklDLCAmc2V2LCAmdGltZXIpID09IDAp OwotCi0JCQltZW1zZXQoJmFjdCwgMCwgc2l6ZW9mKGFjdCkpOwotCQkJYWN0LnNhX3NpZ2FjdGlv biA9IHNpZ2l0ZXI7Ci0JCQlhY3Quc2FfZmxhZ3MgPSBTQV9TSUdJTkZPOwotCQkJaWd0X2Fzc2Vy dChzaWdhY3Rpb24oU0lHUlRNSU4gKyAxLCAmYWN0LCBOVUxMKSA9PSAwKTsKLQotCQkJbWVtc2V0 KCZpdHMsIDAsIHNpemVvZihpdHMpKTsKLQkJCWl0cy5pdF92YWx1ZS50dl9uc2VjID0gMDsKLQkJ CWl0cy5pdF92YWx1ZS50dl9zZWMgPSAxOwotCQkJaWd0X2Fzc2VydCh0aW1lcl9zZXR0aW1lKHRp bWVyLCAwLCAmaXRzLCBOVUxMKSA9PSAwKTsKLQkJfQotCiAJCXdhaXQudGltZW91dF9ucyA9IE5T RUNfUEVSX1NFQyAvIDI7IC8qIDAuNXMgKi8KIAkJaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0KGZk LCAmd2FpdCksIC1FVElNRSk7CiAJCWlndF9hc3NlcnRfZXFfczY0KHdhaXQudGltZW91dF9ucywg MCk7CkBAIC0yMTUsMTMgKzEwNyw5IEBAIHN0YXRpYyB2b2lkIGJhc2ljKGludCBmZCwgdW5zaWdu ZWQgZW5naW5lLCB1bnNpZ25lZCBmbGFncykKIAkJd2FpdC50aW1lb3V0X25zID0gMDsKIAkJaWd0 X2Fzc2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIDApOwogCQlpZ3RfYXNzZXJ0KHdhaXQu dGltZW91dF9ucyA9PSAwKTsKLQotCQlpZiAoKGZsYWdzICYgSEFORykgPT0gMCkKLQkJCXRpbWVy X2RlbGV0ZSh0aW1lcik7CiAJfQogCi0JZ2VtX2Nsb3NlKGZkLCBvYmouaGFuZGxlKTsKLQltdW5t YXAoYmF0Y2gsIDQwOTYpOworCWlndF9zcGluX2JhdGNoX2ZyZWUoZmQsIHNwaW4pOwogfQogCiBp Z3RfbWFpbgotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=