From mboxrd@z Thu Jan 1 00:00:00 1970 From: Abdiel Janulgue Subject: [PATCH] igt/gem_exec_schedule: Use igt_spin_batch Date: Tue, 24 Jan 2017 08:33:13 +0200 Message-ID: <1485239593-5370-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCDA66E6FF for ; Tue, 24 Jan 2017 06:33:25 +0000 (UTC) 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 List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogQWJkaWVsIEphbnVsZ3VlIDxhYmRpZWwuamFudWxndWVAbGludXguaW50 ZWwuY29tPgotLS0KIHRlc3RzL2dlbV9leGVjX3NjaGVkdWxlLmMgfCAxMjAgKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGlu c2VydGlvbnMoKyksIDEwNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fZXhl Y19zY2hlZHVsZS5jIGIvdGVzdHMvZ2VtX2V4ZWNfc2NoZWR1bGUuYwppbmRleCBkODQ1NGQ1Li44 N2Q1YTg1IDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fZXhlY19zY2hlZHVsZS5jCisrKyBiL3Rlc3Rz L2dlbV9leGVjX3NjaGVkdWxlLmMKQEAgLTEwNiw5NiArMTA2LDYgQEAgc3RhdGljIHZvaWQgc3Rv cmVfZHdvcmQoaW50IGZkLCB1aW50MzJfdCBjdHgsIHVuc2lnbmVkIHJpbmcsCiAJZ2VtX2Nsb3Nl KGZkLCBvYmpbMl0uaGFuZGxlKTsKIH0KIAotc3RhdGljIHVpbnQzMl90ICptYWtlX2J1c3koaW50 IGZkLCB1aW50MzJfdCB0YXJnZXQsIHVuc2lnbmVkIHJpbmcpCi17Ci0JY29uc3QgaW50IGdlbiA9 IGludGVsX2dlbihpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSk7Ci0Jc3RydWN0IGRybV9pOTE1X2dl bV9leGVjX29iamVjdDIgb2JqWzJdOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVsb2NhdGlvbl9l bnRyeSByZWxvY1syXTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7 Ci0JdWludDMyX3QgKmJhdGNoOwotCWludCBpOwotCi0JbWVtc2V0KCZleGVjYnVmLCAwLCBzaXpl b2YoZXhlY2J1ZikpOwotCWV4ZWNidWYuYnVmZmVyc19wdHIgPSB0b191c2VyX3BvaW50ZXIob2Jq ICsgIXRhcmdldCk7Ci0JZXhlY2J1Zi5idWZmZXJfY291bnQgPSAxICsgISF0YXJnZXQ7Ci0KLQlt ZW1zZXQob2JqLCAwLCBzaXplb2Yob2JqKSk7Ci0Jb2JqWzBdLmhhbmRsZSA9IHRhcmdldDsKLQlv YmpbMV0uaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7Ci0JYmF0Y2ggPSBnZW1fbW1hcF9f d2MoZmQsIG9ialsxXS5oYW5kbGUsIDAsIDQwOTYsIFBST1RfV1JJVEUpOwotCWdlbV9zZXRfZG9t YWluKGZkLCBvYmpbMV0uaGFuZGxlLAotCQkJSTkxNV9HRU1fRE9NQUlOX0dUVCwgSTkxNV9HRU1f RE9NQUlOX0dUVCk7Ci0KLQlvYmpbMV0ucmVsb2NzX3B0ciA9IHRvX3VzZXJfcG9pbnRlcihyZWxv Yyk7Ci0Jb2JqWzFdLnJlbG9jYXRpb25fY291bnQgPSAxICsgISF0YXJnZXQ7Ci0JbWVtc2V0KHJl bG9jLCAwLCBzaXplb2YocmVsb2MpKTsKLQotCXJlbG9jWzBdLnRhcmdldF9oYW5kbGUgPSBvYmpb MV0uaGFuZGxlOyAvKiByZWN1cnNlICovCi0JcmVsb2NbMF0ucHJlc3VtZWRfb2Zmc2V0ID0gMDsK LQlyZWxvY1swXS5vZmZzZXQgPSBzaXplb2YodWludDMyX3QpOwotCXJlbG9jWzBdLmRlbHRhID0g MDsKLQlyZWxvY1swXS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKLQly ZWxvY1swXS53cml0ZV9kb21haW4gPSAwOwotCi0JcmVsb2NbMV0udGFyZ2V0X2hhbmRsZSA9IHRh cmdldDsKLQlyZWxvY1sxXS5wcmVzdW1lZF9vZmZzZXQgPSAwOwotCXJlbG9jWzFdLm9mZnNldCA9 IDEwMjQ7Ci0JcmVsb2NbMV0uZGVsdGEgPSAwOwotCXJlbG9jWzFdLnJlYWRfZG9tYWlucyA9IEk5 MTVfR0VNX0RPTUFJTl9DT01NQU5EOwotCXJlbG9jWzFdLndyaXRlX2RvbWFpbiA9IDA7Ci0KLQlp ID0gMDsKLQliYXRjaFtpXSA9IE1JX0JBVENIX0JVRkZFUl9TVEFSVDsKLQlpZiAoZ2VuID49IDgp IHsKLQkJYmF0Y2hbaV0gfD0gMSA8PCA4IHwgMTsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JCWJhdGNo WysraV0gPSAwOwotCX0gZWxzZSBpZiAoZ2VuID49IDYpIHsKLQkJYmF0Y2hbaV0gfD0gMSA8PCA4 OwotCQliYXRjaFsrK2ldID0gMDsKLQl9IGVsc2UgewotCQliYXRjaFtpXSB8PSAyIDw8IDY7Ci0J CWJhdGNoWysraV0gPSAwOwotCQlpZiAoZ2VuIDwgNCkgewotCQkJYmF0Y2hbaV0gfD0gMTsKLQkJ CXJlbG9jWzBdLmRlbHRhID0gMTsKLQkJfQotCX0KLQlpKys7Ci0KLQlpZiAocmluZyAhPSAtMSkg ewotCQlleGVjYnVmLmZsYWdzID0gcmluZzsKLQkJZm9yIChpbnQgbiA9IDA7IG4gPCBCVVNZX1FM RU47IG4rKykKLQkJCWdlbV9leGVjYnVmKGZkLCAmZXhlY2J1Zik7Ci0JfSBlbHNlIHsKLQkJZm9y X2VhY2hfZW5naW5lKGZkLCByaW5nKSB7Ci0JCQlpZiAocmluZyA9PSAwKQotCQkJCWNvbnRpbnVl OwotCi0JCQlleGVjYnVmLmZsYWdzID0gcmluZzsKLQkJCWZvciAoaW50IG4gPSAwOyBuIDwgQlVT WV9RTEVOOyBuKyspCi0JCQkJZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKTsKLQkJCWlndF9hc3Nl cnQoZXhlY2J1Zi5mbGFncyA9PSByaW5nKTsKLQkJfQotCX0KLQotCWlmICh0YXJnZXQpIHsKLQkJ ZXhlY2J1Zi5mbGFncyA9IDA7Ci0JCXJlbG9jWzFdLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RP TUFJTl9DT01NQU5EOwotCQlnZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpOwotCX0KLQotCWdlbV9j bG9zZShmZCwgb2JqWzFdLmhhbmRsZSk7Ci0KLQlyZXR1cm4gYmF0Y2g7Ci19Ci0KLXN0YXRpYyB2 b2lkIGZpbmlzaF9idXN5KHVpbnQzMl90ICpidXN5KQotewotCSpidXN5ID0gTUlfQkFUQ0hfQlVG RkVSX0VORDsKLQltdW5tYXAoYnVzeSwgNDA5Nik7Ci19Ci0KIHN0cnVjdCBjb3JrIHsKIAlpbnQg ZGV2aWNlOwogCXVpbnQzMl90IGhhbmRsZTsKQEAgLTIyOCwxMyArMTM4LDEzIEBAIHN0YXRpYyB2 b2lkIHVucGx1ZyhzdHJ1Y3QgY29yayAqYykKIHN0YXRpYyB2b2lkIGZpZm8oaW50IGZkLCB1bnNp Z25lZCByaW5nKQogewogCXN0cnVjdCBjb3JrIGNvcms7Ci0JdWludDMyX3QgKmJ1c3k7CisJaWd0 X3NwaW5fdCAqYnVzeTsKIAl1aW50MzJfdCBzY3JhdGNoOwogCXVpbnQzMl90ICpwdHI7CiAKIAlz Y3JhdGNoID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7CiAKLQlidXN5ID0gbWFrZV9idXN5KGZkLCBz Y3JhdGNoLCByaW5nKTsKKwlidXN5ID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCByaW5nLCBzY3Jh dGNoKTsKIAlwbHVnKGZkLCAmY29yayk7CiAKIAkvKiBTYW1lIHByaW9yaXR5LCBzYW1lIHRpbWVs aW5lLCBmaW5hbCByZXN1bHQgd2lsbCBiZSB0aGUgc2Vjb25kIGViICovCkBAIC0yNDMsMTIgKzE1 MywxMiBAQCBzdGF0aWMgdm9pZCBmaWZvKGludCBmZCwgdW5zaWduZWQgcmluZykKIAogCXVucGx1 ZygmY29yayk7IC8qIG9ubHkgbm93IHN1Ym1pdCBvdXIgYmF0Y2hlcyAqLwogCWlndF9kZWJ1Z2Zz X2R1bXAoZmQsICJpOTE1X2VuZ2luZV9pbmZvIik7Ci0JZmluaXNoX2J1c3koYnVzeSk7CisJaWd0 X3NwaW5fYmF0Y2hfZW5kKGJ1c3kpOwogCiAJcHRyID0gZ2VtX21tYXBfX2d0dChmZCwgc2NyYXRj aCwgNDA5NiwgUFJPVF9SRUFEKTsKIAlnZW1fc2V0X2RvbWFpbihmZCwgc2NyYXRjaCwgLyogbm8g d3JpdGUgaGF6YXJkIGxpZXMhICovCiAJCQlJOTE1X0dFTV9ET01BSU5fR1RULCBJOTE1X0dFTV9E T01BSU5fR1RUKTsKLQlnZW1fY2xvc2UoZmQsIHNjcmF0Y2gpOworCWlndF9zcGluX2JhdGNoX2Zy ZWUoZmQsIGJ1c3kpOwogCiAJaWd0X2Fzc2VydF9lcV91MzIocHRyWzBdLCAyKTsKIAltdW5tYXAo cHRyLCA0MDk2KTsKQEAgLTI1OSw3ICsxNjksNyBAQCBzdGF0aWMgdm9pZCByZW9yZGVyKGludCBm ZCwgdW5zaWduZWQgcmluZywgdW5zaWduZWQgZmxhZ3MpCiB7CiAJc3RydWN0IGNvcmsgY29yazsK IAl1aW50MzJfdCBzY3JhdGNoOwotCXVpbnQzMl90ICpidXN5OworCWlndF9zcGluX3QgKmJ1c3k7 CiAJdWludDMyX3QgKnB0cjsKIAl1aW50MzJfdCBjdHhbMl07CiAKQEAgLTI3MSw3ICsxODEsNyBA QCBzdGF0aWMgdm9pZCByZW9yZGVyKGludCBmZCwgdW5zaWduZWQgcmluZywgdW5zaWduZWQgZmxh Z3MpCiAKIAlzY3JhdGNoID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7CiAKLQlidXN5ID0gbWFrZV9i dXN5KGZkLCBzY3JhdGNoLCByaW5nKTsKKwlidXN5ID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCBy aW5nLCBzY3JhdGNoKTsKIAlwbHVnKGZkLCAmY29yayk7CiAKIAkvKiBXZSBleHBlY3QgdGhlIGhp Z2ggcHJpb3JpdHkgY29udGV4dCB0byBiZSBleGVjdXRlZCBmaXJzdCwgYW5kCkBAIC0yODIsNyAr MTkyLDcgQEAgc3RhdGljIHZvaWQgcmVvcmRlcihpbnQgZmQsIHVuc2lnbmVkIHJpbmcsIHVuc2ln bmVkIGZsYWdzKQogCiAJdW5wbHVnKCZjb3JrKTsgLyogb25seSBub3cgc3VibWl0IG91ciBiYXRj aGVzICovCiAJaWd0X2RlYnVnZnNfZHVtcChmZCwgImk5MTVfZW5naW5lX2luZm8iKTsKLQlmaW5p c2hfYnVzeShidXN5KTsKKwlpZ3Rfc3Bpbl9iYXRjaF9lbmQoYnVzeSk7CiAKIAlnZW1fY29udGV4 dF9kZXN0cm95KGZkLCBjdHhbTE9dKTsKIAlnZW1fY29udGV4dF9kZXN0cm95KGZkLCBjdHhbSEld KTsKQEAgLTI5MCw3ICsyMDAsNyBAQCBzdGF0aWMgdm9pZCByZW9yZGVyKGludCBmZCwgdW5zaWdu ZWQgcmluZywgdW5zaWduZWQgZmxhZ3MpCiAJcHRyID0gZ2VtX21tYXBfX2d0dChmZCwgc2NyYXRj aCwgNDA5NiwgUFJPVF9SRUFEKTsKIAlnZW1fc2V0X2RvbWFpbihmZCwgc2NyYXRjaCwgLyogbm8g d3JpdGUgaGF6YXJkIGxpZXMhICovCiAJCQlJOTE1X0dFTV9ET01BSU5fR1RULCBJOTE1X0dFTV9E T01BSU5fR1RUKTsKLQlnZW1fY2xvc2UoZmQsIHNjcmF0Y2gpOworCWlndF9zcGluX2JhdGNoX2Zy ZWUoZmQsIGJ1c3kpOwogCiAJaWYgKGZsYWdzICYgRVFVQUwpIC8qIGVxdWFsIHByaW9yaXR5LCBy ZXN1bHQgd2lsbCBiZSBmaWZvICovCiAJCWlndF9hc3NlcnRfZXFfdTMyKHB0clswXSwgY3R4W0hJ XSk7CkBAIC0zMDMsNyArMjEzLDcgQEAgc3RhdGljIHZvaWQgcHJvbW90aW9uKGludCBmZCwgdW5z aWduZWQgcmluZykKIHsKIAlzdHJ1Y3QgY29yayBjb3JrOwogCXVpbnQzMl90IHJlc3VsdCwgZGVw OwotCXVpbnQzMl90ICpidXN5OworCWlndF9zcGluX3QgKmJ1c3k7CiAJdWludDMyX3QgKnB0cjsK IAl1aW50MzJfdCBjdHhbM107CiAKQEAgLTMxOSw3ICsyMjksNyBAQCBzdGF0aWMgdm9pZCBwcm9t b3Rpb24oaW50IGZkLCB1bnNpZ25lZCByaW5nKQogCXJlc3VsdCA9IGdlbV9jcmVhdGUoZmQsIDQw OTYpOwogCWRlcCA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwogCi0JYnVzeSA9IG1ha2VfYnVzeShm ZCwgcmVzdWx0LCByaW5nKTsKKwlidXN5ID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCByaW5nLCBy ZXN1bHQpOwogCXBsdWcoZmQsICZjb3JrKTsKIAogCS8qIEV4cGVjdCB0aGF0IEhJIHByb21vdGVz IExPLCBzbyB0aGUgb3JkZXIgd2lsbCBiZSBMTywgSEksIE5PSVNFLgpAQCAtMzM4LDcgKzI0OCw3 IEBAIHN0YXRpYyB2b2lkIHByb21vdGlvbihpbnQgZmQsIHVuc2lnbmVkIHJpbmcpCiAKIAl1bnBs dWcoJmNvcmspOyAvKiBvbmx5IG5vdyBzdWJtaXQgb3VyIGJhdGNoZXMgKi8KIAlpZ3RfZGVidWdm c19kdW1wKGZkLCAiaTkxNV9lbmdpbmVfaW5mbyIpOwotCWZpbmlzaF9idXN5KGJ1c3kpOworCWln dF9zcGluX2JhdGNoX2VuZChidXN5KTsKIAogCWdlbV9jb250ZXh0X2Rlc3Ryb3koZmQsIGN0eFtO T0lTRV0pOwogCWdlbV9jb250ZXh0X2Rlc3Ryb3koZmQsIGN0eFtMT10pOwpAQCAtMzU1LDcgKzI2 NSw3IEBAIHN0YXRpYyB2b2lkIHByb21vdGlvbihpbnQgZmQsIHVuc2lnbmVkIHJpbmcpCiAJcHRy ID0gZ2VtX21tYXBfX2d0dChmZCwgcmVzdWx0LCA0MDk2LCBQUk9UX1JFQUQpOwogCWdlbV9zZXRf ZG9tYWluKGZkLCByZXN1bHQsIC8qIG5vIHdyaXRlIGhhemFyZCBsaWVzISAqLwogCQkJSTkxNV9H RU1fRE9NQUlOX0dUVCwgSTkxNV9HRU1fRE9NQUlOX0dUVCk7Ci0JZ2VtX2Nsb3NlKGZkLCByZXN1 bHQpOworCWlndF9zcGluX2JhdGNoX2ZyZWUoZmQsIGJ1c3kpOwogCiAJaWd0X2Fzc2VydF9lcV91 MzIocHRyWzBdLCBjdHhbTk9JU0VdKTsKIAltdW5tYXAocHRyLCA0MDk2KTsKQEAgLTM2Niw3ICsy NzYsNyBAQCBzdGF0aWMgdm9pZCBkZWVwKGludCBmZCwgdW5zaWduZWQgcmluZykKICNkZWZpbmUg WFMgOAogCXN0cnVjdCBjb3JrIGNvcms7CiAJdWludDMyX3QgcmVzdWx0LCBkZXBbWFNdOwotCXVp bnQzMl90ICpidXN5OworCWlndF9zcGluX3QgKmJ1c3k7CiAJdWludDMyX3QgKnB0cjsKIAl1aW50 MzJfdCAqY3R4OwogCkBAIC0zODAsNyArMjkwLDcgQEAgc3RhdGljIHZvaWQgZGVlcChpbnQgZmQs IHVuc2lnbmVkIHJpbmcpCiAJZm9yIChpbnQgbSA9IDA7IG0gPCBYUzsgbSArKykKIAkJZGVwW21d ID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7CiAKLQlidXN5ID0gbWFrZV9idXN5KGZkLCByZXN1bHQs IHJpbmcpOworCWJ1c3kgPSBpZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIHJpbmcsIHJlc3VsdCk7CiAJ cGx1ZyhmZCwgJmNvcmspOwogCiAJLyogQ3JlYXRlIGEgZGVlcCBkZXBlbmRlbmN5IGNoYWluLCB3 aXRoIGEgZmV3IGJyYW5jaGVzICovCkBAIC0zOTgsNyArMzA4LDcgQEAgc3RhdGljIHZvaWQgZGVl cChpbnQgZmQsIHVuc2lnbmVkIHJpbmcpCiAJaWd0X2Fzc2VydChnZW1fYm9fYnVzeShmZCwgcmVz dWx0KSk7CiAJdW5wbHVnKCZjb3JrKTsgLyogb25seSBub3cgc3VibWl0IG91ciBiYXRjaGVzICov CiAJaWd0X2RlYnVnZnNfZHVtcChmZCwgImk5MTVfZW5naW5lX2luZm8iKTsKLQlmaW5pc2hfYnVz eShidXN5KTsKKwlpZ3Rfc3Bpbl9iYXRjaF9lbmQoYnVzeSk7CiAKIAlmb3IgKGludCBuID0gMDsg biA8PSBNQVhfUFJJTzsgbisrKQogCQlnZW1fY29udGV4dF9kZXN0cm95KGZkLCBjdHhbbl0pOwot LSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=