From mboxrd@z Thu Jan 1 00:00:00 1970 From: Abdiel Janulgue Subject: [i-g-t PATCH v6 2/4] igt/gem_wait: Use new igt_spin_batch Date: Mon, 14 Nov 2016 20:24:40 +0200 Message-ID: <1479147882-27003-3-git-send-email-abdiel.janulgue@linux.intel.com> References: <20161111161652.yucobtlspgf3lulu@phenom.ffwll.local> <1479147882-27003-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C96A16E39C for ; Mon, 14 Nov 2016 10:28:45 +0000 (UTC) In-Reply-To: <1479147882-27003-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 Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFuaWVsIFZl dHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogQWJkaWVsIEphbnVs Z3VlIDxhYmRpZWwuamFudWxndWVAbGludXguaW50ZWwuY29tPgotLS0KIHRlc3RzL2dlbV93YWl0 LmMgfCAxMjUgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMTE4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV93YWl0LmMgYi90ZXN0cy9nZW1fd2FpdC5jCmluZGV4 IGI0MTI3ZGUuLjc4NWJiMTQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV93YWl0LmMKKysrIGIvdGVz 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 ID09IDApID8gTlNFQ19QRVJfU0VDIDogMDsKKwl3YWl0X3MgPSAoKGZsYWdzICYgSEFORykgPT0g MCkgPyB3YWl0X3MgOiAtMTsKKwlpZ3Rfc3Bpbl90IHNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaChmZCwg d2FpdF9zLCBlbmdpbmUsIDApOworCWludCB0aW1lb3V0OwogCiAJbWVtc2V0KCZ3YWl0LCAwLCBz aXplb2Yod2FpdCkpOwotCXdhaXQuYm9faGFuZGxlID0gb2JqLmhhbmRsZTsKLQlpZ3RfYXNzZXJ0 X2VxKF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSwgLUVUSU1FKTsKKwl3YWl0LmJvX2hhbmRsZSA9IHNw aW4uaGFuZGxlOwogCiAJaWYgKGZsYWdzICYgQlVTWSkgewogCQlzdHJ1Y3QgdGltZXNwZWMgdHY7 CiAKIAkJdGltZW91dCA9IDEyMDsKLQkJaWYgKChmbGFncyAmIEhBTkcpID09IDApIHsKLQkJCSpi YXRjaCA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7Ci0JCQlfX3N5bmNfc3luY2hyb25pemUoKTsKKwkJ aWYgKChmbGFncyAmIEhBTkcpID09IDApCiAJCQl0aW1lb3V0ID0gMTsKLQkJfQogCiAJCW1lbXNl dCgmdHYsIDAsIHNpemVvZih0dikpOwogCQl3aGlsZSAoX19nZW1fd2FpdChmZCwgJndhaXQpID09 IC1FVElNRSkKIAkJCWlndF9hc3NlcnQoaWd0X3NlY29uZHNfZWxhcHNlZCgmdHYpIDwgdGltZW91 dCk7CiAJfSBlbHNlIHsKLQkJdGltZXJfdCB0aW1lcjsKLQotCQlpZiAoKGZsYWdzICYgSEFORykg PT0gMCkgewotCQkJc3RydWN0IHNpZ2V2ZW50IHNldjsKLQkJCXN0cnVjdCBzaWdhY3Rpb24gYWN0 OwotCQkJc3RydWN0IGl0aW1lcnNwZWMgaXRzOwotCi0JCQltZW1zZXQoJnNldiwgMCwgc2l6ZW9m KHNldikpOwotCQkJc2V2LnNpZ2V2X25vdGlmeSA9IFNJR0VWX1NJR05BTCB8IFNJR0VWX1RIUkVB RF9JRDsKLQkJCXNldi5zaWdldl9ub3RpZnlfdGhyZWFkX2lkID0gZ2V0dGlkKCk7Ci0JCQlzZXYu c2lnZXZfc2lnbm8gPSBTSUdSVE1JTiArIDE7Ci0JCQlpZ3RfYXNzZXJ0KHRpbWVyX2NyZWF0ZShD TE9DS19NT05PVE9OSUMsICZzZXYsICZ0aW1lcikgPT0gMCk7Ci0KLQkJCW1lbXNldCgmYWN0LCAw LCBzaXplb2YoYWN0KSk7Ci0JCQlhY3Quc2Ffc2lnYWN0aW9uID0gc2lnaXRlcjsKLQkJCWFjdC5z YV9mbGFncyA9IFNBX1NJR0lORk87Ci0JCQlpZ3RfYXNzZXJ0KHNpZ2FjdGlvbihTSUdSVE1JTiAr IDEsICZhY3QsIE5VTEwpID09IDApOwotCi0JCQltZW1zZXQoJml0cywgMCwgc2l6ZW9mKGl0cykp OwotCQkJaXRzLml0X3ZhbHVlLnR2X25zZWMgPSAwOwotCQkJaXRzLml0X3ZhbHVlLnR2X3NlYyA9 IDE7Ci0JCQlpZ3RfYXNzZXJ0KHRpbWVyX3NldHRpbWUodGltZXIsIDAsICZpdHMsIE5VTEwpID09 IDApOwotCQl9Ci0KIAkJd2FpdC50aW1lb3V0X25zID0gTlNFQ19QRVJfU0VDIC8gMjsgLyogMC41 cyAqLwogCQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSwgLUVUSU1FKTsKIAkJ aWd0X2Fzc2VydF9lcV9zNjQod2FpdC50aW1lb3V0X25zLCAwKTsKQEAgLTIxNSwxMyArMTA4LDkg QEAgc3RhdGljIHZvaWQgYmFzaWMoaW50IGZkLCB1bnNpZ25lZCBlbmdpbmUsIHVuc2lnbmVkIGZs YWdzKQogCQl3YWl0LnRpbWVvdXRfbnMgPSAwOwogCQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX3dhaXQo ZmQsICZ3YWl0KSwgMCk7CiAJCWlndF9hc3NlcnQod2FpdC50aW1lb3V0X25zID09IDApOwotCi0J CWlmICgoZmxhZ3MgJiBIQU5HKSA9PSAwKQotCQkJdGltZXJfZGVsZXRlKHRpbWVyKTsKIAl9CiAK LQlnZW1fY2xvc2UoZmQsIG9iai5oYW5kbGUpOwotCW11bm1hcChiYXRjaCwgNDA5Nik7CisJaWd0 X3Bvc3Rfc3Bpbl9iYXRjaChmZCwgc3Bpbik7CiB9CiAKIGlndF9tYWluCi0tIAoyLjcuNAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==