From mboxrd@z Thu Jan 1 00:00:00 1970 From: Abdiel Janulgue Subject: [i-g-t PATCH v7 3/5] igt/gem_wait: Use new igt_spin_batch Date: Wed, 16 Nov 2016 23:18:02 +0200 Message-ID: <1479331084-11891-4-git-send-email-abdiel.janulgue@linux.intel.com> References: <1479331084-11891-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 118D76E6A0 for ; Wed, 16 Nov 2016 13:22:21 +0000 (UTC) In-Reply-To: <1479331084-11891-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 djc6IEFkYXB0IHRvIGFwaSByZW5hbWUKCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClNp Z25lZC1vZmYtYnk6IEFiZGllbCBKYW51bGd1ZSA8YWJkaWVsLmphbnVsZ3VlQGxpbnV4LmludGVs LmNvbT4KLS0tCiB0ZXN0cy9nZW1fd2FpdC5jIHwgMTI5ICsrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2Vy dGlvbnMoKyksIDEyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fd2FpdC5j IGIvdGVzdHMvZ2VtX3dhaXQuYwppbmRleCBiNDEyN2RlLi5kMjkyMGU1IDEwMDY0NAotLS0gYS90 ZXN0cy9nZW1fd2FpdC5jCisrKyBiL3Rlc3RzL2dlbV93YWl0LmMKQEAgLTI3LDE4ICsyNyw2IEBA CiAKICNpbmNsdWRlICJpZ3QuaCIKIAotI2luY2x1ZGUgPHNpZ25hbC5oPgotI2luY2x1ZGUgPHRp bWUuaD4KLSNpbmNsdWRlIDxzeXMvc3lzY2FsbC5oPgotCi0jZGVmaW5lIGdldHRpZCgpIHN5c2Nh bGwoX19OUl9nZXR0aWQpCi0jZGVmaW5lIHNpZ2V2X25vdGlmeV90aHJlYWRfaWQgX3NpZ2V2X3Vu Ll90aWQKLQotI2RlZmluZSBMT0NBTF9JOTE1X0VYRUNfQlNEX1NISUZUICAgICAgKDEzKQotI2Rl ZmluZSBMT0NBTF9JOTE1X0VYRUNfQlNEX01BU0sgICAgICAgKDMgPDwgTE9DQUxfSTkxNV9FWEVD X0JTRF9TSElGVCkKLQotI2RlZmluZSBFTkdJTkVfTUFTSyAgKEk5MTVfRVhFQ19SSU5HX01BU0sg fCBMT0NBTF9JOTE1X0VYRUNfQlNEX01BU0spCi0KIHN0YXRpYyBpbnQgX19nZW1fd2FpdChpbnQg ZmQsIHN0cnVjdCBkcm1faTkxNV9nZW1fd2FpdCAqdykKIHsKIAlpbnQgZXJyOwpAQCAtNzUsMTI5 ICs2MywzMCBAQCBzdGF0aWMgdm9pZCBpbnZhbGlkX2J1ZihpbnQgZmQpCiAJaWd0X2Fzc2VydF9l cShfX2dlbV93YWl0KGZkLCAmd2FpdCksIC1FTk9FTlQpOwogfQogCi1zdGF0aWMgdWludDMyX3Qg KmJhdGNoOwotCi1zdGF0aWMgdm9pZCBzaWdpdGVyKGludCBzaWcsIHNpZ2luZm9fdCAqaW5mbywg dm9pZCAqYXJnKQotewotCSpiYXRjaCA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7Ci0JX19zeW5jX3N5 bmNocm9uaXplKCk7Ci19Ci0KLSNkZWZpbmUgTVNFQ19QRVJfU0VDICgxMDAwKQotI2RlZmluZSBV U0VDX1BFUl9TRUMgKDEwMDAgKiBNU0VDX1BFUl9TRUMpCi0jZGVmaW5lIE5TRUNfUEVSX1NFQyAo MTAwMCAqIFVTRUNfUEVSX1NFQykKLQogI2RlZmluZSBCVVNZIDEKICNkZWZpbmUgSEFORyAyCiBz dGF0aWMgdm9pZCBiYXNpYyhpbnQgZmQsIHVuc2lnbmVkIGVuZ2luZSwgdW5zaWduZWQgZmxhZ3Mp CiB7Ci0JY29uc3QgaW50IGdlbiA9IGludGVsX2dlbihpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSk7 Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVjdDIgb2JqOwotCXN0cnVjdCBkcm1faTkx NV9nZW1fcmVsb2NhdGlvbl9lbnRyeSByZWxvYzsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNi dWZmZXIyIGV4ZWNidWY7CiAJc3RydWN0IGRybV9pOTE1X2dlbV93YWl0IHdhaXQ7Ci0JdW5zaWdu ZWQgZW5naW5lc1sxNl07Ci0JdW5zaWduZWQgbmVuZ2luZTsKLQlpbnQgaSwgdGltZW91dDsKLQot CW5lbmdpbmUgPSAwOwotCWlmIChlbmdpbmUgPT0gLTEpIHsKLQkJZm9yX2VhY2hfZW5naW5lKGZk LCBlbmdpbmUpCi0JCQlpZiAoZW5naW5lKSBlbmdpbmVzW25lbmdpbmUrK10gPSBlbmdpbmU7Ci0J fSBlbHNlIHsKLQkJaWd0X3JlcXVpcmUoZ2VtX2hhc19yaW5nKGZkLCBlbmdpbmUpKTsKLQkJZW5n aW5lc1tuZW5naW5lKytdID0gZW5naW5lOwotCX0KLQlpZ3RfcmVxdWlyZShuZW5naW5lKTsKLQot CW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6ZW9mKGV4ZWNidWYpKTsKLQlleGVjYnVmLmJ1ZmZlcnNf cHRyID0gKHVpbnRwdHJfdCkmb2JqOwotCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMTsKLQotCW1l bXNldCgmb2JqLCAwLCBzaXplb2Yob2JqKSk7Ci0Jb2JqLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQs IDQwOTYpOwotCi0Jb2JqLnJlbG9jc19wdHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmoucmVs b2NhdGlvbl9jb3VudCA9IDE7Ci0JbWVtc2V0KCZyZWxvYywgMCwgc2l6ZW9mKHJlbG9jKSk7Ci0K LQliYXRjaCA9IGdlbV9tbWFwX19ndHQoZmQsIG9iai5oYW5kbGUsIDQwOTYsIFBST1RfV1JJVEUp OwotCWdlbV9zZXRfZG9tYWluKGZkLCBvYmouaGFuZGxlLAotCQkJSTkxNV9HRU1fRE9NQUlOX0dU VCwgSTkxNV9HRU1fRE9NQUlOX0dUVCk7Ci0KLQlyZWxvYy50YXJnZXRfaGFuZGxlID0gb2JqLmhh bmRsZTsgLyogcmVjdXJzZSAqLwotCXJlbG9jLnByZXN1bWVkX29mZnNldCA9IDA7Ci0JcmVsb2Mu b2Zmc2V0ID0gc2l6ZW9mKHVpbnQzMl90KTsKLQlyZWxvYy5kZWx0YSA9IDA7Ci0JcmVsb2MucmVh ZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2Mud3JpdGVfZG9tYWlu ID0gMDsKLQotCWkgPSAwOwotCWJhdGNoW2ldID0gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUOwotCWlm IChnZW4gPj0gOCkgewotCQliYXRjaFtpXSB8PSAxIDw8IDggfCAxOwotCQliYXRjaFsrK2ldID0g MDsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JfSBlbHNlIGlmIChnZW4gPj0gNikgewotCQliYXRjaFtp XSB8PSAxIDw8IDg7Ci0JCWJhdGNoWysraV0gPSAwOwotCX0gZWxzZSB7Ci0JCWJhdGNoW2ldIHw9 IDIgPDwgNjsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JCWlmIChnZW4gPCA0KSB7Ci0JCQliYXRjaFtp XSB8PSAxOwotCQkJcmVsb2MuZGVsdGEgPSAxOwotCQl9Ci0JfQotCi0JZm9yIChpID0gMDsgaSA8 IG5lbmdpbmU7IGkrKykgewotCQlleGVjYnVmLmZsYWdzICY9IH5FTkdJTkVfTUFTSzsKLQkJZXhl Y2J1Zi5mbGFncyB8PSBlbmdpbmVzW2ldOwotCQlnZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpOwot CX0KKwlpbnQgd2FpdF9zID0gKGZsYWdzID09IDApID8gTlNFQ19QRVJfU0VDIDogMDsKKwl3YWl0 X3MgPSAoKGZsYWdzICYgSEFORykgPT0gMCkgPyB3YWl0X3MgOiAtMTsKKwlpZ3Rfc3Bpbl90ICpz cGluID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCB3YWl0X3MsIGVuZ2luZSwgMCk7CisJaW50IHRp bWVvdXQ7CiAKIAltZW1zZXQoJndhaXQsIDAsIHNpemVvZih3YWl0KSk7Ci0Jd2FpdC5ib19oYW5k bGUgPSBvYmouaGFuZGxlOwotCWlndF9hc3NlcnRfZXEoX19nZW1fd2FpdChmZCwgJndhaXQpLCAt RVRJTUUpOworCXdhaXQuYm9faGFuZGxlID0gc3Bpbi0+aGFuZGxlOwogCiAJaWYgKGZsYWdzICYg QlVTWSkgewogCQlzdHJ1Y3QgdGltZXNwZWMgdHY7CiAKIAkJdGltZW91dCA9IDEyMDsKLQkJaWYg KChmbGFncyAmIEhBTkcpID09IDApIHsKLQkJCSpiYXRjaCA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7 Ci0JCQlfX3N5bmNfc3luY2hyb25pemUoKTsKKwkJaWYgKChmbGFncyAmIEhBTkcpID09IDApCiAJ CQl0aW1lb3V0ID0gMTsKLQkJfQogCiAJCW1lbXNldCgmdHYsIDAsIHNpemVvZih0dikpOwogCQl3 aGlsZSAoX19nZW1fd2FpdChmZCwgJndhaXQpID09IC1FVElNRSkKIAkJCWlndF9hc3NlcnQoaWd0 X3NlY29uZHNfZWxhcHNlZCgmdHYpIDwgdGltZW91dCk7CiAJfSBlbHNlIHsKLQkJdGltZXJfdCB0 aW1lcjsKLQotCQlpZiAoKGZsYWdzICYgSEFORykgPT0gMCkgewotCQkJc3RydWN0IHNpZ2V2ZW50 IHNldjsKLQkJCXN0cnVjdCBzaWdhY3Rpb24gYWN0OwotCQkJc3RydWN0IGl0aW1lcnNwZWMgaXRz OwotCi0JCQltZW1zZXQoJnNldiwgMCwgc2l6ZW9mKHNldikpOwotCQkJc2V2LnNpZ2V2X25vdGlm eSA9IFNJR0VWX1NJR05BTCB8IFNJR0VWX1RIUkVBRF9JRDsKLQkJCXNldi5zaWdldl9ub3RpZnlf dGhyZWFkX2lkID0gZ2V0dGlkKCk7Ci0JCQlzZXYuc2lnZXZfc2lnbm8gPSBTSUdSVE1JTiArIDE7 Ci0JCQlpZ3RfYXNzZXJ0KHRpbWVyX2NyZWF0ZShDTE9DS19NT05PVE9OSUMsICZzZXYsICZ0aW1l cikgPT0gMCk7Ci0KLQkJCW1lbXNldCgmYWN0LCAwLCBzaXplb2YoYWN0KSk7Ci0JCQlhY3Quc2Ff c2lnYWN0aW9uID0gc2lnaXRlcjsKLQkJCWFjdC5zYV9mbGFncyA9IFNBX1NJR0lORk87Ci0JCQlp Z3RfYXNzZXJ0KHNpZ2FjdGlvbihTSUdSVE1JTiArIDEsICZhY3QsIE5VTEwpID09IDApOwotCi0J CQltZW1zZXQoJml0cywgMCwgc2l6ZW9mKGl0cykpOwotCQkJaXRzLml0X3ZhbHVlLnR2X25zZWMg PSAwOwotCQkJaXRzLml0X3ZhbHVlLnR2X3NlYyA9IDE7Ci0JCQlpZ3RfYXNzZXJ0KHRpbWVyX3Nl dHRpbWUodGltZXIsIDAsICZpdHMsIE5VTEwpID09IDApOwotCQl9Ci0KIAkJd2FpdC50aW1lb3V0 X25zID0gTlNFQ19QRVJfU0VDIC8gMjsgLyogMC41cyAqLwogCQlpZ3RfYXNzZXJ0X2VxKF9fZ2Vt X3dhaXQoZmQsICZ3YWl0KSwgLUVUSU1FKTsKIAkJaWd0X2Fzc2VydF9lcV9zNjQod2FpdC50aW1l b3V0X25zLCAwKTsKQEAgLTIxNSwxMyArMTA0LDkgQEAgc3RhdGljIHZvaWQgYmFzaWMoaW50IGZk LCB1bnNpZ25lZCBlbmdpbmUsIHVuc2lnbmVkIGZsYWdzKQogCQl3YWl0LnRpbWVvdXRfbnMgPSAw OwogCQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX3dhaXQoZmQsICZ3YWl0KSwgMCk7CiAJCWlndF9hc3Nl cnQod2FpdC50aW1lb3V0X25zID09IDApOwotCi0JCWlmICgoZmxhZ3MgJiBIQU5HKSA9PSAwKQot CQkJdGltZXJfZGVsZXRlKHRpbWVyKTsKIAl9CiAKLQlnZW1fY2xvc2UoZmQsIG9iai5oYW5kbGUp OwotCW11bm1hcChiYXRjaCwgNDA5Nik7CisJaWd0X3NwaW5fYmF0Y2hfZnJlZShmZCwgc3Bpbik7 CiB9CiAKIGlndF9tYWluCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==