From: Abdiel Janulgue Subject: [i-g-t PATCH v9 1/3] igt/gem_wait: Use new igt_spin_batch Date: Mon, 21 Nov 2016 14:07:47 +0200 Message-ID: <1479730067-8508-1-git-send-email-abdiel.janulgue@linux.intel.com> References: 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 357366E40C for ; Mon, 21 Nov 2016 12:07:27 +0000 (UTC) In-Reply-To: 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 V2lsc29uKQp2OTogRXhwbGljaXRseSBxdWl0IHRoZSBiYXRjaCBpbnN0ZWFkIG9mIHRpbWluZyBv dXQgcmlnaHQgYXdheQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IFRvbWV1IFZp em9zbyA8dG9tZXVAdG9tZXV2aXpvc28ubmV0PgpTaWduZWQtb2ZmLWJ5OiBBYmRpZWwgSmFudWxn dWUgPGFiZGllbC5qYW51bGd1ZUBsaW51eC5pbnRlbC5jb20+Ci0tLQogdGVzdHMvZ2VtX3dhaXQu YyB8IDEyNiArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAxMTkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvdGVzdHMvZ2VtX3dhaXQuYyBiL3Rlc3RzL2dlbV93YWl0LmMKaW5kZXgg YjQxMjdkZS4uMjdkMTNmNSAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX3dhaXQuYworKysgYi90ZXN0 cy9nZW1fd2FpdC5jCkBAIC0yNywxOCArMjcsNiBAQAogCiAjaW5jbHVkZSAiaWd0LmgiCiAKLSNp bmNsdWRlIDxzaWduYWwuaD4KLSNpbmNsdWRlIDx0aW1lLmg+Ci0jaW5jbHVkZSA8c3lzL3N5c2Nh bGwuaD4KLQotI2RlZmluZSBnZXR0aWQoKSBzeXNjYWxsKF9fTlJfZ2V0dGlkKQotI2RlZmluZSBz aWdldl9ub3RpZnlfdGhyZWFkX2lkIF9zaWdldl91bi5fdGlkCi0KLSNkZWZpbmUgTE9DQUxfSTkx NV9FWEVDX0JTRF9TSElGVCAgICAgICgxMykKLSNkZWZpbmUgTE9DQUxfSTkxNV9FWEVDX0JTRF9N QVNLICAgICAgICgzIDw8IExPQ0FMX0k5MTVfRVhFQ19CU0RfU0hJRlQpCi0KLSNkZWZpbmUgRU5H SU5FX01BU0sgIChJOTE1X0VYRUNfUklOR19NQVNLIHwgTE9DQUxfSTkxNV9FWEVDX0JTRF9NQVNL KQotCiBzdGF0aWMgaW50IF9fZ2VtX3dhaXQoaW50IGZkLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3dh aXQgKncpCiB7CiAJaW50IGVycjsKQEAgLTc1LDg5ICs2MywxOCBAQCBzdGF0aWMgdm9pZCBpbnZh bGlkX2J1ZihpbnQgZmQpCiAJaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIC1F Tk9FTlQpOwogfQogCi1zdGF0aWMgdWludDMyX3QgKmJhdGNoOwotCi1zdGF0aWMgdm9pZCBzaWdp dGVyKGludCBzaWcsIHNpZ2luZm9fdCAqaW5mbywgdm9pZCAqYXJnKQotewotCSpiYXRjaCA9IE1J X0JBVENIX0JVRkZFUl9FTkQ7Ci0JX19zeW5jX3N5bmNocm9uaXplKCk7Ci19Ci0KLSNkZWZpbmUg TVNFQ19QRVJfU0VDICgxMDAwKQotI2RlZmluZSBVU0VDX1BFUl9TRUMgKDEwMDAgKiBNU0VDX1BF Ul9TRUMpCi0jZGVmaW5lIE5TRUNfUEVSX1NFQyAoMTAwMCAqIFVTRUNfUEVSX1NFQykKLQogI2Rl ZmluZSBCVVNZIDEKICNkZWZpbmUgSEFORyAyCiBzdGF0aWMgdm9pZCBiYXNpYyhpbnQgZmQsIHVu c2lnbmVkIGVuZ2luZSwgdW5zaWduZWQgZmxhZ3MpCiB7Ci0JY29uc3QgaW50IGdlbiA9IGludGVs X2dlbihpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSk7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9leGVj X29iamVjdDIgb2JqOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVsb2NhdGlvbl9lbnRyeSByZWxv YzsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7CiAJc3RydWN0IGRy bV9pOTE1X2dlbV93YWl0IHdhaXQ7Ci0JdW5zaWduZWQgZW5naW5lc1sxNl07Ci0JdW5zaWduZWQg bmVuZ2luZTsKLQlpbnQgaSwgdGltZW91dDsKLQotCW5lbmdpbmUgPSAwOwotCWlmIChlbmdpbmUg PT0gLTEpIHsKLQkJZm9yX2VhY2hfZW5naW5lKGZkLCBlbmdpbmUpCi0JCQlpZiAoZW5naW5lKSBl bmdpbmVzW25lbmdpbmUrK10gPSBlbmdpbmU7Ci0JfSBlbHNlIHsKLQkJaWd0X3JlcXVpcmUoZ2Vt X2hhc19yaW5nKGZkLCBlbmdpbmUpKTsKLQkJZW5naW5lc1tuZW5naW5lKytdID0gZW5naW5lOwot CX0KLQlpZ3RfcmVxdWlyZShuZW5naW5lKTsKLQotCW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6ZW9m KGV4ZWNidWYpKTsKLQlleGVjYnVmLmJ1ZmZlcnNfcHRyID0gKHVpbnRwdHJfdCkmb2JqOwotCWV4 ZWNidWYuYnVmZmVyX2NvdW50ID0gMTsKLQotCW1lbXNldCgmb2JqLCAwLCBzaXplb2Yob2JqKSk7 Ci0Jb2JqLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwotCi0Jb2JqLnJlbG9jc19wdHIg PSAodWludHB0cl90KSZyZWxvYzsKLQlvYmoucmVsb2NhdGlvbl9jb3VudCA9IDE7Ci0JbWVtc2V0 KCZyZWxvYywgMCwgc2l6ZW9mKHJlbG9jKSk7Ci0KLQliYXRjaCA9IGdlbV9tbWFwX19ndHQoZmQs IG9iai5oYW5kbGUsIDQwOTYsIFBST1RfV1JJVEUpOwotCWdlbV9zZXRfZG9tYWluKGZkLCBvYmou aGFuZGxlLAotCQkJSTkxNV9HRU1fRE9NQUlOX0dUVCwgSTkxNV9HRU1fRE9NQUlOX0dUVCk7Ci0K LQlyZWxvYy50YXJnZXRfaGFuZGxlID0gb2JqLmhhbmRsZTsgLyogcmVjdXJzZSAqLwotCXJlbG9j LnByZXN1bWVkX29mZnNldCA9IDA7Ci0JcmVsb2Mub2Zmc2V0ID0gc2l6ZW9mKHVpbnQzMl90KTsK LQlyZWxvYy5kZWx0YSA9IDA7Ci0JcmVsb2MucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0JcmVsb2Mud3JpdGVfZG9tYWluID0gMDsKLQotCWkgPSAwOwotCWJhdGNoW2ld ID0gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUOwotCWlmIChnZW4gPj0gOCkgewotCQliYXRjaFtpXSB8 PSAxIDw8IDggfCAxOwotCQliYXRjaFsrK2ldID0gMDsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JfSBl bHNlIGlmIChnZW4gPj0gNikgewotCQliYXRjaFtpXSB8PSAxIDw8IDg7Ci0JCWJhdGNoWysraV0g PSAwOwotCX0gZWxzZSB7Ci0JCWJhdGNoW2ldIHw9IDIgPDwgNjsKLQkJYmF0Y2hbKytpXSA9IDA7 Ci0JCWlmIChnZW4gPCA0KSB7Ci0JCQliYXRjaFtpXSB8PSAxOwotCQkJcmVsb2MuZGVsdGEgPSAx OwotCQl9Ci0JfQotCi0JZm9yIChpID0gMDsgaSA8IG5lbmdpbmU7IGkrKykgewotCQlleGVjYnVm LmZsYWdzICY9IH5FTkdJTkVfTUFTSzsKLQkJZXhlY2J1Zi5mbGFncyB8PSBlbmdpbmVzW2ldOwot CQlnZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpOwotCX0KKwlpZ3Rfc3Bpbl90ICpzcGluOworCWlu dCB0aW1lb3V0OworCWludCB3YWl0X3MgPSAoZmxhZ3MgPT0gMCkgPyBOU0VDX1BFUl9TRUMgOiAt MTsKKwlzcGluID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCB3YWl0X3MsIGVuZ2luZSwgMCk7CiAK IAltZW1zZXQoJndhaXQsIDAsIHNpemVvZih3YWl0KSk7Ci0Jd2FpdC5ib19oYW5kbGUgPSBvYmou aGFuZGxlOworCXdhaXQuYm9faGFuZGxlID0gc3Bpbi0+aGFuZGxlOwogCWlndF9hc3NlcnRfZXEo X19nZW1fd2FpdChmZCwgJndhaXQpLCAtRVRJTUUpOwogCiAJaWYgKGZsYWdzICYgQlVTWSkgewpA QCAtMTY1LDggKzgyLDcgQEAgc3RhdGljIHZvaWQgYmFzaWMoaW50IGZkLCB1bnNpZ25lZCBlbmdp bmUsIHVuc2lnbmVkIGZsYWdzKQogCiAJCXRpbWVvdXQgPSAxMjA7CiAJCWlmICgoZmxhZ3MgJiBI QU5HKSA9PSAwKSB7Ci0JCQkqYmF0Y2ggPSBNSV9CQVRDSF9CVUZGRVJfRU5EOwotCQkJX19zeW5j X3N5bmNocm9uaXplKCk7CisJCQlpZ3Rfc3Bpbl9iYXRjaF9leGl0KHNwaW4pOwogCQkJdGltZW91 dCA9IDE7CiAJCX0KIApAQCAtMTc0LDMwICs5MCw2IEBAIHN0YXRpYyB2b2lkIGJhc2ljKGludCBm ZCwgdW5zaWduZWQgZW5naW5lLCB1bnNpZ25lZCBmbGFncykKIAkJd2hpbGUgKF9fZ2VtX3dhaXQo ZmQsICZ3YWl0KSA9PSAtRVRJTUUpCiAJCQlpZ3RfYXNzZXJ0KGlndF9zZWNvbmRzX2VsYXBzZWQo JnR2KSA8IHRpbWVvdXQpOwogCX0gZWxzZSB7Ci0JCXRpbWVyX3QgdGltZXI7Ci0KLQkJaWYgKChm bGFncyAmIEhBTkcpID09IDApIHsKLQkJCXN0cnVjdCBzaWdldmVudCBzZXY7Ci0JCQlzdHJ1Y3Qg c2lnYWN0aW9uIGFjdDsKLQkJCXN0cnVjdCBpdGltZXJzcGVjIGl0czsKLQotCQkJbWVtc2V0KCZz ZXYsIDAsIHNpemVvZihzZXYpKTsKLQkJCXNldi5zaWdldl9ub3RpZnkgPSBTSUdFVl9TSUdOQUwg fCBTSUdFVl9USFJFQURfSUQ7Ci0JCQlzZXYuc2lnZXZfbm90aWZ5X3RocmVhZF9pZCA9IGdldHRp ZCgpOwotCQkJc2V2LnNpZ2V2X3NpZ25vID0gU0lHUlRNSU4gKyAxOwotCQkJaWd0X2Fzc2VydCh0 aW1lcl9jcmVhdGUoQ0xPQ0tfTU9OT1RPTklDLCAmc2V2LCAmdGltZXIpID09IDApOwotCi0JCQlt ZW1zZXQoJmFjdCwgMCwgc2l6ZW9mKGFjdCkpOwotCQkJYWN0LnNhX3NpZ2FjdGlvbiA9IHNpZ2l0 ZXI7Ci0JCQlhY3Quc2FfZmxhZ3MgPSBTQV9TSUdJTkZPOwotCQkJaWd0X2Fzc2VydChzaWdhY3Rp b24oU0lHUlRNSU4gKyAxLCAmYWN0LCBOVUxMKSA9PSAwKTsKLQotCQkJbWVtc2V0KCZpdHMsIDAs IHNpemVvZihpdHMpKTsKLQkJCWl0cy5pdF92YWx1ZS50dl9uc2VjID0gMDsKLQkJCWl0cy5pdF92 YWx1ZS50dl9zZWMgPSAxOwotCQkJaWd0X2Fzc2VydCh0aW1lcl9zZXR0aW1lKHRpbWVyLCAwLCAm aXRzLCBOVUxMKSA9PSAwKTsKLQkJfQotCiAJCXdhaXQudGltZW91dF9ucyA9IE5TRUNfUEVSX1NF QyAvIDI7IC8qIDAuNXMgKi8KIAkJaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCks IC1FVElNRSk7CiAJCWlndF9hc3NlcnRfZXFfczY0KHdhaXQudGltZW91dF9ucywgMCk7CkBAIC0y MTUsMTMgKzEwNyw5IEBAIHN0YXRpYyB2b2lkIGJhc2ljKGludCBmZCwgdW5zaWduZWQgZW5naW5l LCB1bnNpZ25lZCBmbGFncykKIAkJd2FpdC50aW1lb3V0X25zID0gMDsKIAkJaWd0X2Fzc2VydF9l cShfX2dlbV93YWl0KGZkLCAmd2FpdCksIDApOwogCQlpZ3RfYXNzZXJ0KHdhaXQudGltZW91dF9u cyA9PSAwKTsKLQotCQlpZiAoKGZsYWdzICYgSEFORykgPT0gMCkKLQkJCXRpbWVyX2RlbGV0ZSh0 aW1lcik7CiAJfQogCi0JZ2VtX2Nsb3NlKGZkLCBvYmouaGFuZGxlKTsKLQltdW5tYXAoYmF0Y2gs IDQwOTYpOworCWlndF9zcGluX2JhdGNoX2ZyZWUoZmQsIHNwaW4pOwogfQogCiBpZ3RfbWFpbgot LSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=