From: Abdiel Janulgue Subject: [PATCH 2/3] igt/gem_wait: Use new igt_spin_batch Date: Fri, 28 Oct 2016 18:47:25 +0300 Message-ID: <20161028154726.17512-3-abdiel.janulgue@linux.intel.com> References: <20161028154726.17512-1-abdiel.janulgue@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8E156EC21 for ; Fri, 28 Oct 2016 15:48:21 +0000 (UTC) In-Reply-To: <20161028154726.17512-1-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 Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFuaWVsIFZl dHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogQWJkaWVsIEphbnVs Z3VlIDxhYmRpZWwuamFudWxndWVAbGludXguaW50ZWwuY29tPgotLS0KIHRlc3RzL2dlbV93YWl0 LmMgfCAxMjUgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMTE4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV93YWl0LmMgYi90ZXN0cy9nZW1fd2FpdC5jCmluZGV4 IGI0MTI3ZGUuLjYzMDA1OGMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV93YWl0LmMKKysrIGIvdGVz dHMvZ2VtX3dhaXQuYwpAQCAtMjcsMTggKzI3LDYgQEAKIAogI2luY2x1ZGUgImlndC5oIgogCi0j aW5jbHVkZSA8c2lnbmFsLmg+Ci0jaW5jbHVkZSA8dGltZS5oPgotI2luY2x1ZGUgPHN5cy9zeXNj YWxsLmg+Ci0KLSNkZWZpbmUgZ2V0dGlkKCkgc3lzY2FsbChfX05SX2dldHRpZCkKLSNkZWZpbmUg c2lnZXZfbm90aWZ5X3RocmVhZF9pZCBfc2lnZXZfdW4uX3RpZAotCi0jZGVmaW5lIExPQ0FMX0k5 MTVfRVhFQ19CU0RfU0hJRlQgICAgICAoMTMpCi0jZGVmaW5lIExPQ0FMX0k5MTVfRVhFQ19CU0Rf TUFTSyAgICAgICAoMyA8PCBMT0NBTF9JOTE1X0VYRUNfQlNEX1NISUZUKQotCi0jZGVmaW5lIEVO R0lORV9NQVNLICAoSTkxNV9FWEVDX1JJTkdfTUFTSyB8IExPQ0FMX0k5MTVfRVhFQ19CU0RfTUFT SykKLQogc3RhdGljIGludCBfX2dlbV93YWl0KGludCBmZCwgc3RydWN0IGRybV9pOTE1X2dlbV93 YWl0ICp3KQogewogCWludCBlcnI7CkBAIC03NSwxNCArNjMsNiBAQCBzdGF0aWMgdm9pZCBpbnZh bGlkX2J1ZihpbnQgZmQpCiAJaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIC1F Tk9FTlQpOwogfQogCi1zdGF0aWMgdWludDMyX3QgKmJhdGNoOwotCi1zdGF0aWMgdm9pZCBzaWdp dGVyKGludCBzaWcsIHNpZ2luZm9fdCAqaW5mbywgdm9pZCAqYXJnKQotewotCSpiYXRjaCA9IE1J X0JBVENIX0JVRkZFUl9FTkQ7Ci0JX19zeW5jX3N5bmNocm9uaXplKCk7Ci19Ci0KICNkZWZpbmUg TVNFQ19QRVJfU0VDICgxMDAwKQogI2RlZmluZSBVU0VDX1BFUl9TRUMgKDEwMDAgKiBNU0VDX1BF Ul9TRUMpCiAjZGVmaW5lIE5TRUNfUEVSX1NFQyAoMTAwMCAqIFVTRUNfUEVSX1NFQykKQEAgLTkx LDExMyArNzEsMjYgQEAgc3RhdGljIHZvaWQgc2lnaXRlcihpbnQgc2lnLCBzaWdpbmZvX3QgKmlu Zm8sIHZvaWQgKmFyZykKICNkZWZpbmUgSEFORyAyCiBzdGF0aWMgdm9pZCBiYXNpYyhpbnQgZmQs IHVuc2lnbmVkIGVuZ2luZSwgdW5zaWduZWQgZmxhZ3MpCiB7Ci0JY29uc3QgaW50IGdlbiA9IGlu dGVsX2dlbihpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSk7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9l eGVjX29iamVjdDIgb2JqOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVsb2NhdGlvbl9lbnRyeSBy ZWxvYzsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7CiAJc3RydWN0 IGRybV9pOTE1X2dlbV93YWl0IHdhaXQ7Ci0JdW5zaWduZWQgZW5naW5lc1sxNl07Ci0JdW5zaWdu ZWQgbmVuZ2luZTsKLQlpbnQgaSwgdGltZW91dDsKLQotCW5lbmdpbmUgPSAwOwotCWlmIChlbmdp bmUgPT0gLTEpIHsKLQkJZm9yX2VhY2hfZW5naW5lKGZkLCBlbmdpbmUpCi0JCQlpZiAoZW5naW5l KSBlbmdpbmVzW25lbmdpbmUrK10gPSBlbmdpbmU7Ci0JfSBlbHNlIHsKLQkJaWd0X3JlcXVpcmUo Z2VtX2hhc19yaW5nKGZkLCBlbmdpbmUpKTsKLQkJZW5naW5lc1tuZW5naW5lKytdID0gZW5naW5l OwotCX0KLQlpZ3RfcmVxdWlyZShuZW5naW5lKTsKLQotCW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6 ZW9mKGV4ZWNidWYpKTsKLQlleGVjYnVmLmJ1ZmZlcnNfcHRyID0gKHVpbnRwdHJfdCkmb2JqOwot CWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMTsKLQotCW1lbXNldCgmb2JqLCAwLCBzaXplb2Yob2Jq KSk7Ci0Jb2JqLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwotCi0Jb2JqLnJlbG9jc19w dHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmoucmVsb2NhdGlvbl9jb3VudCA9IDE7Ci0JbWVt c2V0KCZyZWxvYywgMCwgc2l6ZW9mKHJlbG9jKSk7Ci0KLQliYXRjaCA9IGdlbV9tbWFwX19ndHQo ZmQsIG9iai5oYW5kbGUsIDQwOTYsIFBST1RfV1JJVEUpOwotCWdlbV9zZXRfZG9tYWluKGZkLCBv YmouaGFuZGxlLAotCQkJSTkxNV9HRU1fRE9NQUlOX0dUVCwgSTkxNV9HRU1fRE9NQUlOX0dUVCk7 Ci0KLQlyZWxvYy50YXJnZXRfaGFuZGxlID0gb2JqLmhhbmRsZTsgLyogcmVjdXJzZSAqLwotCXJl bG9jLnByZXN1bWVkX29mZnNldCA9IDA7Ci0JcmVsb2Mub2Zmc2V0ID0gc2l6ZW9mKHVpbnQzMl90 KTsKLQlyZWxvYy5kZWx0YSA9IDA7Ci0JcmVsb2MucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9N QUlOX0NPTU1BTkQ7Ci0JcmVsb2Mud3JpdGVfZG9tYWluID0gMDsKLQotCWkgPSAwOwotCWJhdGNo W2ldID0gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUOwotCWlmIChnZW4gPj0gOCkgewotCQliYXRjaFtp XSB8PSAxIDw8IDggfCAxOwotCQliYXRjaFsrK2ldID0gMDsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0J fSBlbHNlIGlmIChnZW4gPj0gNikgewotCQliYXRjaFtpXSB8PSAxIDw8IDg7Ci0JCWJhdGNoWysr aV0gPSAwOwotCX0gZWxzZSB7Ci0JCWJhdGNoW2ldIHw9IDIgPDwgNjsKLQkJYmF0Y2hbKytpXSA9 IDA7Ci0JCWlmIChnZW4gPCA0KSB7Ci0JCQliYXRjaFtpXSB8PSAxOwotCQkJcmVsb2MuZGVsdGEg PSAxOwotCQl9Ci0JfQotCi0JZm9yIChpID0gMDsgaSA8IG5lbmdpbmU7IGkrKykgewotCQlleGVj YnVmLmZsYWdzICY9IH5FTkdJTkVfTUFTSzsKLQkJZXhlY2J1Zi5mbGFncyB8PSBlbmdpbmVzW2ld OwotCQlnZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpOwotCX0KKwlpbnQgd2FpdF9zID0gKGZsYWdz ID09IDApID8gMSA6IDA7CisJd2FpdF9zID0gKChmbGFncyAmIEhBTkcpID09IDApID8gd2FpdF9z IDogLTE7CisJaWd0X3NwaW5fdCBzcGluID0gaWd0X3NwaW5fYmF0Y2goZmQsIHdhaXRfcywgZW5n aW5lKTsKKwlpbnQgdGltZW91dDsKIAogCW1lbXNldCgmd2FpdCwgMCwgc2l6ZW9mKHdhaXQpKTsK LQl3YWl0LmJvX2hhbmRsZSA9IG9iai5oYW5kbGU7Ci0JaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0 KGZkLCAmd2FpdCksIC1FVElNRSk7CisJd2FpdC5ib19oYW5kbGUgPSBzcGluLmhhbmRsZTsKIAog CWlmIChmbGFncyAmIEJVU1kpIHsKIAkJc3RydWN0IHRpbWVzcGVjIHR2OwogCiAJCXRpbWVvdXQg PSAxMjA7Ci0JCWlmICgoZmxhZ3MgJiBIQU5HKSA9PSAwKSB7Ci0JCQkqYmF0Y2ggPSBNSV9CQVRD SF9CVUZGRVJfRU5EOwotCQkJX19zeW5jX3N5bmNocm9uaXplKCk7CisJCWlmICgoZmxhZ3MgJiBI QU5HKSA9PSAwKQogCQkJdGltZW91dCA9IDE7Ci0JCX0KIAogCQltZW1zZXQoJnR2LCAwLCBzaXpl b2YodHYpKTsKIAkJd2hpbGUgKF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSA9PSAtRVRJTUUpCiAJCQlp Z3RfYXNzZXJ0KGlndF9zZWNvbmRzX2VsYXBzZWQoJnR2KSA8IHRpbWVvdXQpOwogCX0gZWxzZSB7 Ci0JCXRpbWVyX3QgdGltZXI7Ci0KLQkJaWYgKChmbGFncyAmIEhBTkcpID09IDApIHsKLQkJCXN0 cnVjdCBzaWdldmVudCBzZXY7Ci0JCQlzdHJ1Y3Qgc2lnYWN0aW9uIGFjdDsKLQkJCXN0cnVjdCBp dGltZXJzcGVjIGl0czsKLQotCQkJbWVtc2V0KCZzZXYsIDAsIHNpemVvZihzZXYpKTsKLQkJCXNl di5zaWdldl9ub3RpZnkgPSBTSUdFVl9TSUdOQUwgfCBTSUdFVl9USFJFQURfSUQ7Ci0JCQlzZXYu c2lnZXZfbm90aWZ5X3RocmVhZF9pZCA9IGdldHRpZCgpOwotCQkJc2V2LnNpZ2V2X3NpZ25vID0g U0lHUlRNSU4gKyAxOwotCQkJaWd0X2Fzc2VydCh0aW1lcl9jcmVhdGUoQ0xPQ0tfTU9OT1RPTklD LCAmc2V2LCAmdGltZXIpID09IDApOwotCi0JCQltZW1zZXQoJmFjdCwgMCwgc2l6ZW9mKGFjdCkp OwotCQkJYWN0LnNhX3NpZ2FjdGlvbiA9IHNpZ2l0ZXI7Ci0JCQlhY3Quc2FfZmxhZ3MgPSBTQV9T SUdJTkZPOwotCQkJaWd0X2Fzc2VydChzaWdhY3Rpb24oU0lHUlRNSU4gKyAxLCAmYWN0LCBOVUxM KSA9PSAwKTsKLQotCQkJbWVtc2V0KCZpdHMsIDAsIHNpemVvZihpdHMpKTsKLQkJCWl0cy5pdF92 YWx1ZS50dl9uc2VjID0gMDsKLQkJCWl0cy5pdF92YWx1ZS50dl9zZWMgPSAxOwotCQkJaWd0X2Fz c2VydCh0aW1lcl9zZXR0aW1lKHRpbWVyLCAwLCAmaXRzLCBOVUxMKSA9PSAwKTsKLQkJfQotCiAJ CXdhaXQudGltZW91dF9ucyA9IE5TRUNfUEVSX1NFQyAvIDI7IC8qIDAuNXMgKi8KIAkJaWd0X2Fz c2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIC1FVElNRSk7CiAJCWlndF9hc3NlcnRfZXFf czY0KHdhaXQudGltZW91dF9ucywgMCk7CkBAIC0yMTUsMTMgKzEwOCw5IEBAIHN0YXRpYyB2b2lk IGJhc2ljKGludCBmZCwgdW5zaWduZWQgZW5naW5lLCB1bnNpZ25lZCBmbGFncykKIAkJd2FpdC50 aW1lb3V0X25zID0gMDsKIAkJaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIDAp OwogCQlpZ3RfYXNzZXJ0KHdhaXQudGltZW91dF9ucyA9PSAwKTsKLQotCQlpZiAoKGZsYWdzICYg SEFORykgPT0gMCkKLQkJCXRpbWVyX2RlbGV0ZSh0aW1lcik7CiAJfQogCi0JZ2VtX2Nsb3NlKGZk LCBvYmouaGFuZGxlKTsKLQltdW5tYXAoYmF0Y2gsIDQwOTYpOworCWlndF9wb3N0X3NwaW5fYmF0 Y2goZmQsIHNwaW4pOwogfQogCiBpZ3RfbWFpbgotLSAKMi43LjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=