From mboxrd@z Thu Jan 1 00:00:00 1970 From: Abdiel Janulgue Subject: [i-g-t PATCH v10 3/5] igt/gem_wait: Use new igt_spin_batch Date: Wed, 23 Nov 2016 12:59:41 +0200 Message-ID: <20161123105943.5157-4-abdiel.janulgue@linux.intel.com> References: <20161123105943.5157-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A90216E7EF for ; Wed, 23 Nov 2016 10:59:54 +0000 (UTC) In-Reply-To: <20161123105943.5157-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 djc6IEFkYXB0IHRvIGFwaSByZW5hbWUKdjg6IFJlc3RvcmUgc2FuaXR5Y2hlY2sgd2FpdCBvbiB0 aGUgcmVjdXJzaXZlIGJhdGNoIGFuZAogICAgYXZvaWQgdXNpbmcgQzk5IGxvY2FscyAoQ2hyaXMg V2lsc29uKQp2OTogRXhwbGljaXRseSBxdWl0IHRoZSBiYXRjaCBpbnN0ZWFkIG9mIHRpbWluZyBv dXQgcmlnaHQgYXdheQp2MTA6IEFkYXB0IHRvIGFwaSByZW5hbWUKCkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAZmZ3bGwuY2g+ClJldmlld2VkLWJ5OiBUb21ldSBWaXpvc28gPHRvbWV1LnZpem9zb0Bjb2xs YWJvcmEuY29tPgpTaWduZWQtb2ZmLWJ5OiBBYmRpZWwgSmFudWxndWUgPGFiZGllbC5qYW51bGd1 ZUBsaW51eC5pbnRlbC5jb20+Ci0tLQogdGVzdHMvZ2VtX3dhaXQuYyB8IDEyNCArKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNiBpbnNlcnRpb25zKCspLCAxMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVz dHMvZ2VtX3dhaXQuYyBiL3Rlc3RzL2dlbV93YWl0LmMKaW5kZXggYjQxMjdkZS4uZWJjYWVjMiAx MDA2NDQKLS0tIGEvdGVzdHMvZ2VtX3dhaXQuYworKysgYi90ZXN0cy9nZW1fd2FpdC5jCkBAIC0y NywxOCArMjcsNiBAQAogCiAjaW5jbHVkZSAiaWd0LmgiCiAKLSNpbmNsdWRlIDxzaWduYWwuaD4K LSNpbmNsdWRlIDx0aW1lLmg+Ci0jaW5jbHVkZSA8c3lzL3N5c2NhbGwuaD4KLQotI2RlZmluZSBn ZXR0aWQoKSBzeXNjYWxsKF9fTlJfZ2V0dGlkKQotI2RlZmluZSBzaWdldl9ub3RpZnlfdGhyZWFk X2lkIF9zaWdldl91bi5fdGlkCi0KLSNkZWZpbmUgTE9DQUxfSTkxNV9FWEVDX0JTRF9TSElGVCAg ICAgICgxMykKLSNkZWZpbmUgTE9DQUxfSTkxNV9FWEVDX0JTRF9NQVNLICAgICAgICgzIDw8IExP Q0FMX0k5MTVfRVhFQ19CU0RfU0hJRlQpCi0KLSNkZWZpbmUgRU5HSU5FX01BU0sgIChJOTE1X0VY RUNfUklOR19NQVNLIHwgTE9DQUxfSTkxNV9FWEVDX0JTRF9NQVNLKQotCiBzdGF0aWMgaW50IF9f Z2VtX3dhaXQoaW50IGZkLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3dhaXQgKncpCiB7CiAJaW50IGVy cjsKQEAgLTc1LDk4ICs2MywyNCBAQCBzdGF0aWMgdm9pZCBpbnZhbGlkX2J1ZihpbnQgZmQpCiAJ aWd0X2Fzc2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIC1FTk9FTlQpOwogfQogCi1zdGF0 aWMgdWludDMyX3QgKmJhdGNoOwotCi1zdGF0aWMgdm9pZCBzaWdpdGVyKGludCBzaWcsIHNpZ2lu Zm9fdCAqaW5mbywgdm9pZCAqYXJnKQotewotCSpiYXRjaCA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7 Ci0JX19zeW5jX3N5bmNocm9uaXplKCk7Ci19Ci0KLSNkZWZpbmUgTVNFQ19QRVJfU0VDICgxMDAw KQotI2RlZmluZSBVU0VDX1BFUl9TRUMgKDEwMDAgKiBNU0VDX1BFUl9TRUMpCi0jZGVmaW5lIE5T RUNfUEVSX1NFQyAoMTAwMCAqIFVTRUNfUEVSX1NFQykKLQogI2RlZmluZSBCVVNZIDEKICNkZWZp bmUgSEFORyAyCiBzdGF0aWMgdm9pZCBiYXNpYyhpbnQgZmQsIHVuc2lnbmVkIGVuZ2luZSwgdW5z aWduZWQgZmxhZ3MpCiB7Ci0JY29uc3QgaW50IGdlbiA9IGludGVsX2dlbihpbnRlbF9nZXRfZHJt X2RldmlkKGZkKSk7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVjdDIgb2JqOwotCXN0 cnVjdCBkcm1faTkxNV9nZW1fcmVsb2NhdGlvbl9lbnRyeSByZWxvYzsKLQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7CiAJc3RydWN0IGRybV9pOTE1X2dlbV93YWl0IHdh aXQ7Ci0JdW5zaWduZWQgZW5naW5lc1sxNl07Ci0JdW5zaWduZWQgbmVuZ2luZTsKLQlpbnQgaSwg dGltZW91dDsKLQotCW5lbmdpbmUgPSAwOwotCWlmIChlbmdpbmUgPT0gLTEpIHsKLQkJZm9yX2Vh Y2hfZW5naW5lKGZkLCBlbmdpbmUpCi0JCQlpZiAoZW5naW5lKSBlbmdpbmVzW25lbmdpbmUrK10g PSBlbmdpbmU7Ci0JfSBlbHNlIHsKLQkJaWd0X3JlcXVpcmUoZ2VtX2hhc19yaW5nKGZkLCBlbmdp bmUpKTsKLQkJZW5naW5lc1tuZW5naW5lKytdID0gZW5naW5lOwotCX0KLQlpZ3RfcmVxdWlyZShu ZW5naW5lKTsKLQotCW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6ZW9mKGV4ZWNidWYpKTsKLQlleGVj YnVmLmJ1ZmZlcnNfcHRyID0gKHVpbnRwdHJfdCkmb2JqOwotCWV4ZWNidWYuYnVmZmVyX2NvdW50 ID0gMTsKLQotCW1lbXNldCgmb2JqLCAwLCBzaXplb2Yob2JqKSk7Ci0Jb2JqLmhhbmRsZSA9IGdl bV9jcmVhdGUoZmQsIDQwOTYpOwotCi0Jb2JqLnJlbG9jc19wdHIgPSAodWludHB0cl90KSZyZWxv YzsKLQlvYmoucmVsb2NhdGlvbl9jb3VudCA9IDE7Ci0JbWVtc2V0KCZyZWxvYywgMCwgc2l6ZW9m KHJlbG9jKSk7Ci0KLQliYXRjaCA9IGdlbV9tbWFwX19ndHQoZmQsIG9iai5oYW5kbGUsIDQwOTYs IFBST1RfV1JJVEUpOwotCWdlbV9zZXRfZG9tYWluKGZkLCBvYmouaGFuZGxlLAotCQkJSTkxNV9H RU1fRE9NQUlOX0dUVCwgSTkxNV9HRU1fRE9NQUlOX0dUVCk7Ci0KLQlyZWxvYy50YXJnZXRfaGFu ZGxlID0gb2JqLmhhbmRsZTsgLyogcmVjdXJzZSAqLwotCXJlbG9jLnByZXN1bWVkX29mZnNldCA9 IDA7Ci0JcmVsb2Mub2Zmc2V0ID0gc2l6ZW9mKHVpbnQzMl90KTsKLQlyZWxvYy5kZWx0YSA9IDA7 Ci0JcmVsb2MucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2Mu d3JpdGVfZG9tYWluID0gMDsKLQotCWkgPSAwOwotCWJhdGNoW2ldID0gTUlfQkFUQ0hfQlVGRkVS X1NUQVJUOwotCWlmIChnZW4gPj0gOCkgewotCQliYXRjaFtpXSB8PSAxIDw8IDggfCAxOwotCQli YXRjaFsrK2ldID0gMDsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JfSBlbHNlIGlmIChnZW4gPj0gNikg ewotCQliYXRjaFtpXSB8PSAxIDw8IDg7Ci0JCWJhdGNoWysraV0gPSAwOwotCX0gZWxzZSB7Ci0J CWJhdGNoW2ldIHw9IDIgPDwgNjsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JCWlmIChnZW4gPCA0KSB7 Ci0JCQliYXRjaFtpXSB8PSAxOwotCQkJcmVsb2MuZGVsdGEgPSAxOwotCQl9Ci0JfQotCi0JZm9y IChpID0gMDsgaSA8IG5lbmdpbmU7IGkrKykgewotCQlleGVjYnVmLmZsYWdzICY9IH5FTkdJTkVf TUFTSzsKLQkJZXhlY2J1Zi5mbGFncyB8PSBlbmdpbmVzW2ldOwotCQlnZW1fZXhlY2J1ZihmZCwg JmV4ZWNidWYpOwotCX0KKwlpZ3Rfc3Bpbl90ICpzcGluID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZk LCBlbmdpbmUsIE5VTEwpOwogCiAJbWVtc2V0KCZ3YWl0LCAwLCBzaXplb2Yod2FpdCkpOwotCXdh aXQuYm9faGFuZGxlID0gb2JqLmhhbmRsZTsKKwl3YWl0LmJvX2hhbmRsZSA9IHNwaW4tPmhhbmRs ZTsKIAlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSwgLUVUSU1FKTsKIAogCWlm IChmbGFncyAmIEJVU1kpIHsKKwkJaW50IHRpbWVvdXQ7CiAJCXN0cnVjdCB0aW1lc3BlYyB0djsK IAogCQl0aW1lb3V0ID0gMTIwOwogCQlpZiAoKGZsYWdzICYgSEFORykgPT0gMCkgewotCQkJKmJh dGNoID0gTUlfQkFUQ0hfQlVGRkVSX0VORDsKLQkJCV9fc3luY19zeW5jaHJvbml6ZSgpOworCQkJ aWd0X3NwaW5fYmF0Y2hfZW5kKHNwaW4pOwogCQkJdGltZW91dCA9IDE7CiAJCX0KIApAQCAtMTc0 LDI5ICs4OCw3IEBAIHN0YXRpYyB2b2lkIGJhc2ljKGludCBmZCwgdW5zaWduZWQgZW5naW5lLCB1 bnNpZ25lZCBmbGFncykKIAkJd2hpbGUgKF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSA9PSAtRVRJTUUp CiAJCQlpZ3RfYXNzZXJ0KGlndF9zZWNvbmRzX2VsYXBzZWQoJnR2KSA8IHRpbWVvdXQpOwogCX0g ZWxzZSB7Ci0JCXRpbWVyX3QgdGltZXI7Ci0KLQkJaWYgKChmbGFncyAmIEhBTkcpID09IDApIHsK LQkJCXN0cnVjdCBzaWdldmVudCBzZXY7Ci0JCQlzdHJ1Y3Qgc2lnYWN0aW9uIGFjdDsKLQkJCXN0 cnVjdCBpdGltZXJzcGVjIGl0czsKLQotCQkJbWVtc2V0KCZzZXYsIDAsIHNpemVvZihzZXYpKTsK LQkJCXNldi5zaWdldl9ub3RpZnkgPSBTSUdFVl9TSUdOQUwgfCBTSUdFVl9USFJFQURfSUQ7Ci0J CQlzZXYuc2lnZXZfbm90aWZ5X3RocmVhZF9pZCA9IGdldHRpZCgpOwotCQkJc2V2LnNpZ2V2X3Np Z25vID0gU0lHUlRNSU4gKyAxOwotCQkJaWd0X2Fzc2VydCh0aW1lcl9jcmVhdGUoQ0xPQ0tfTU9O T1RPTklDLCAmc2V2LCAmdGltZXIpID09IDApOwotCi0JCQltZW1zZXQoJmFjdCwgMCwgc2l6ZW9m KGFjdCkpOwotCQkJYWN0LnNhX3NpZ2FjdGlvbiA9IHNpZ2l0ZXI7Ci0JCQlhY3Quc2FfZmxhZ3Mg PSBTQV9TSUdJTkZPOwotCQkJaWd0X2Fzc2VydChzaWdhY3Rpb24oU0lHUlRNSU4gKyAxLCAmYWN0 LCBOVUxMKSA9PSAwKTsKLQotCQkJbWVtc2V0KCZpdHMsIDAsIHNpemVvZihpdHMpKTsKLQkJCWl0 cy5pdF92YWx1ZS50dl9uc2VjID0gMDsKLQkJCWl0cy5pdF92YWx1ZS50dl9zZWMgPSAxOwotCQkJ aWd0X2Fzc2VydCh0aW1lcl9zZXR0aW1lKHRpbWVyLCAwLCAmaXRzLCBOVUxMKSA9PSAwKTsKLQkJ fQorCQlpZ3Rfc3Bpbl9iYXRjaF9zZXRfdGltZW91dChzcGluLCBOU0VDX1BFUl9TRUMpOwogCiAJ CXdhaXQudGltZW91dF9ucyA9IE5TRUNfUEVSX1NFQyAvIDI7IC8qIDAuNXMgKi8KIAkJaWd0X2Fz c2VydF9lcShfX2dlbV93YWl0KGZkLCAmd2FpdCksIC1FVElNRSk7CkBAIC0yMTUsMTMgKzEwNyw5 IEBAIHN0YXRpYyB2b2lkIGJhc2ljKGludCBmZCwgdW5zaWduZWQgZW5naW5lLCB1bnNpZ25lZCBm bGFncykKIAkJd2FpdC50aW1lb3V0X25zID0gMDsKIAkJaWd0X2Fzc2VydF9lcShfX2dlbV93YWl0 KGZkLCAmd2FpdCksIDApOwogCQlpZ3RfYXNzZXJ0KHdhaXQudGltZW91dF9ucyA9PSAwKTsKLQot CQlpZiAoKGZsYWdzICYgSEFORykgPT0gMCkKLQkJCXRpbWVyX2RlbGV0ZSh0aW1lcik7CiAJfQog Ci0JZ2VtX2Nsb3NlKGZkLCBvYmouaGFuZGxlKTsKLQltdW5tYXAoYmF0Y2gsIDQwOTYpOworCWln dF9zcGluX2JhdGNoX2ZyZWUoZmQsIHNwaW4pOwogfQogCiBpZ3RfbWFpbgotLSAKMi45LjMKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=