From: Antonio Argenziano Subject: [PATCH v2] igt/gem_reset_stats: Fix pending batches status expectation Date: Mon, 12 Jun 2017 14:37:05 -0700 Message-ID: <20170612213705.7575-1-antonio.argenziano@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 840D66E1EB for ; Mon, 12 Jun 2017 21:37:17 +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 VGVzdCBleHBlY3RzIHBlbmRpbmcgYmF0Y2hlcyB0byBiZSBkaXNjYXJkZWQgYWZ0ZXIgYSByZXNl dC4gQWZ0ZXIgY29tbWl0CjgyMWVkN2RmNmUyYSAoImRybS9pOTE1OiBVcGRhdGUgcmVzZXQgcGF0 aCB0byBmaXggaW5jb21wbGV0ZSByZXF1ZXN0cyIpLApUaGF0IGlzIG5vIGxvbmdlciB0aGUgY2Fz ZS4gRml4ZWQgdG8gZXhwZWN0IGEgbm9ybWFsIGV4ZWN1dGlvbi4KClYyOiBVcGRhdGVkIGNvbW1p dCBtZXNzYWdlIChNaWNoZWwgVGhpZXJyeSkKCkNjOiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRo aWVycnlAaW50ZWwuY29tPgoKU2lnbmVkLW9mZi1ieTogQW50b25pbyBBcmdlbnppYW5vIDxhbnRv bmlvLmFyZ2Vuemlhbm9AaW50ZWwuY29tPgotLS0KIHRlc3RzL2dlbV9yZXNldF9zdGF0cy5jIHwg MjQgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25z KCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fcmVzZXRfc3RhdHMu YyBiL3Rlc3RzL2dlbV9yZXNldF9zdGF0cy5jCmluZGV4IGM0Y2U0YWMyLi43M2FmZWViMiAxMDA2 NDQKLS0tIGEvdGVzdHMvZ2VtX3Jlc2V0X3N0YXRzLmMKKysrIGIvdGVzdHMvZ2VtX3Jlc2V0X3N0 YXRzLmMKQEAgLTIzOSw3ICsyMzksNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X3JzKGNvbnN0IHN0cnVj dCBpbnRlbF9leGVjdXRpb25fZW5naW5lICplLAogCQlpZiAoaSA9PSBoYW5nX2luZGV4KQogCQkJ YXNzZXJ0X3Jlc2V0X3N0YXR1cyhpLCBmZFtpXSwgMCwgUlNfQkFUQ0hfQUNUSVZFKTsKIAkJaWYg KGkgPiBoYW5nX2luZGV4KQotCQkJYXNzZXJ0X3Jlc2V0X3N0YXR1cyhpLCBmZFtpXSwgMCwgUlNf QkFUQ0hfUEVORElORyk7CisJCQlhc3NlcnRfcmVzZXRfc3RhdHVzKGksIGZkW2ldLCAwLCBSU19O T19FUlJPUik7CiAJfQogCiAJaWd0X2Fzc2VydChpZ3Rfc2Vjb25kc19lbGFwc2VkKCZ0c19pbmpl Y3RlZCkgPD0gMzApOwpAQCAtMzEyLDEwICszMTIsMTAgQEAgc3RhdGljIHZvaWQgdGVzdF9yc19j dHgoY29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUgKmUsCiAJCQkJCQkgICAgUlNf QkFUQ0hfQUNUSVZFKTsKIAkJCWlmIChpID09IGhhbmdfaW5kZXggJiYgaiA+IGhhbmdfY29udGV4 dCkKIAkJCQlhc3NlcnRfcmVzZXRfc3RhdHVzKGksIGZkW2ldLCBjdHhbaV1bal0sCi0JCQkJCQkg ICAgUlNfQkFUQ0hfUEVORElORyk7CisJCQkJCQkgICAgUlNfTk9fRVJST1IpOwogCQkJaWYgKGkg PiBoYW5nX2luZGV4KQogCQkJCWFzc2VydF9yZXNldF9zdGF0dXMoaSwgZmRbaV0sIGN0eFtpXVtq XSwKLQkJCQkJCSAgICBSU19CQVRDSF9QRU5ESU5HKTsKKwkJCQkJCSAgICBSU19OT19FUlJPUik7 CiAJCX0KIAl9CiAKQEAgLTMzMCw3ICszMzAsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X2Jhbihjb25z dCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX2VuZ2luZSAqZSkKIAlzdHJ1Y3QgbG9jYWxfZHJtX2k5 MTVfcmVzZXRfc3RhdHMgcnNfYmFkLCByc19nb29kOwogCWludCBmZF9iYWQsIGZkX2dvb2Q7CiAJ aW50IGJhbiwgcmV0cnkgPSAxMDsKLQlpbnQgYWN0aXZlX2NvdW50ID0gMCwgcGVuZGluZ19jb3Vu dCA9IDA7CisJaW50IGFjdGl2ZV9jb3VudCA9IDA7CiAKIAlmZF9iYWQgPSBkcm1fb3Blbl9kcml2 ZXIoRFJJVkVSX0lOVEVMKTsKIAlmZF9nb29kID0gZHJtX29wZW5fZHJpdmVyKERSSVZFUl9JTlRF TCk7CkBAIC0zNTAsOSArMzUwLDYgQEAgc3RhdGljIHZvaWQgdGVzdF9iYW4oY29uc3Qgc3RydWN0 IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUgKmUpCiAJbm9vcChmZF9nb29kLCAwLCBlKTsKIAlub29w KGZkX2dvb2QsIDAsIGUpOwogCi0JLyogVGhlIHNlY29uZCBoYW5nIHdpbGwgY291bnQgYXMgcGVu ZGluZyBhbmQgYmUgZGlzY2FyZGVkICovCi0JYWN0aXZlX2NvdW50LS07Ci0JcGVuZGluZ19jb3Vu dCArPSAxOyAvKiBpbmplY3QgaGFuZyBkb2VzIDEgcmVhbCBleGVjICsgMSBkdW1teSAqLwogCXdo aWxlIChyZXRyeS0tKSB7CiAJCWluamVjdF9oYW5nKGZkX2JhZCwgMCwgZSwgQkFOKTsKIAkJYWN0 aXZlX2NvdW50Kys7CkBAIC0zNzMsMTIgKzM3MCwxMCBAQCBzdGF0aWMgdm9pZCB0ZXN0X2Jhbihj b25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX2VuZ2luZSAqZSkKIAlhc3NlcnRfcmVzZXRfc3Rh dHVzKGZkX2JhZCwgZmRfYmFkLCAwLCBSU19CQVRDSF9BQ1RJVkUpOwogCWlndF9hc3NlcnRfZXEo Z2VtX3Jlc2V0X3N0YXRzKGZkX2JhZCwgMCwgJnJzX2JhZCksIDApOwogCWlndF9hc3NlcnRfZXEo cnNfYmFkLmJhdGNoX2FjdGl2ZSwgYWN0aXZlX2NvdW50KTsKLQlpZ3RfYXNzZXJ0X2VxKHJzX2Jh ZC5iYXRjaF9wZW5kaW5nLCBwZW5kaW5nX2NvdW50KTsKIAotCWFzc2VydF9yZXNldF9zdGF0dXMo ZmRfZ29vZCwgZmRfZ29vZCwgMCwgUlNfQkFUQ0hfUEVORElORyk7CisJYXNzZXJ0X3Jlc2V0X3N0 YXR1cyhmZF9nb29kLCBmZF9nb29kLCAwLCBSU19OT19FUlJPUik7CiAJaWd0X2Fzc2VydF9lcShn ZW1fcmVzZXRfc3RhdHMoZmRfZ29vZCwgMCwgJnJzX2dvb2QpLCAwKTsKIAlpZ3RfYXNzZXJ0X2Vx KHJzX2dvb2QuYmF0Y2hfYWN0aXZlLCAwKTsKLQlpZ3RfYXNzZXJ0X2VxKHJzX2dvb2QuYmF0Y2hf cGVuZGluZywgMik7CiAKIAljbG9zZShmZF9iYWQpOwogCWNsb3NlKGZkX2dvb2QpOwpAQCAtMzg5 LDcgKzM4NCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfYmFuX2N0eChjb25zdCBzdHJ1Y3QgaW50ZWxf ZXhlY3V0aW9uX2VuZ2luZSAqZSkKIAlzdHJ1Y3QgbG9jYWxfZHJtX2k5MTVfcmVzZXRfc3RhdHMg cnNfYmFkLCByc19nb29kOwogCWludCBmZCwgYmFuLCByZXRyeSA9IDEwOwogCXVpbnQzMl90IGN0 eF9nb29kLCBjdHhfYmFkOwotCWludCBhY3RpdmVfY291bnQgPSAwLCBwZW5kaW5nX2NvdW50ID0g MDsKKwlpbnQgYWN0aXZlX2NvdW50ID0gMDsKIAogCWZkID0gZHJtX29wZW5fZHJpdmVyKERSSVZF Ul9JTlRFTCk7CiAKQEAgLTQxNCw5ICs0MDksNiBAQCBzdGF0aWMgdm9pZCB0ZXN0X2Jhbl9jdHgo Y29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUgKmUpCiAJbm9vcChmZCwgY3R4X2dv b2QsIGUpOwogCW5vb3AoZmQsIGN0eF9nb29kLCBlKTsKIAotCS8qIFRoaXMgc2Vjb25kIGhhbmcg d2lsbCBjb3VudCBhcyBwZW5kaW5nIGFuZCBiZSBkaXNjYXJkZWQgKi8KLQlhY3RpdmVfY291bnQt LTsKLQlwZW5kaW5nX2NvdW50Kys7CiAJd2hpbGUgKHJldHJ5LS0pIHsKIAkJaW5qZWN0X2hhbmco ZmQsIGN0eF9iYWQsIGUsIEJBTik7CiAJCWFjdGl2ZV9jb3VudCsrOwpAQCAtNDM3LDEyICs0Mjks MTAgQEAgc3RhdGljIHZvaWQgdGVzdF9iYW5fY3R4KGNvbnN0IHN0cnVjdCBpbnRlbF9leGVjdXRp b25fZW5naW5lICplKQogCWFzc2VydF9yZXNldF9zdGF0dXMoZmQsIGZkLCBjdHhfYmFkLCBSU19C QVRDSF9BQ1RJVkUpOwogCWlndF9hc3NlcnRfZXEoZ2VtX3Jlc2V0X3N0YXRzKGZkLCBjdHhfYmFk LCAmcnNfYmFkKSwgMCk7CiAJaWd0X2Fzc2VydF9lcShyc19iYWQuYmF0Y2hfYWN0aXZlLCBhY3Rp dmVfY291bnQpOwotCWlndF9hc3NlcnRfZXEocnNfYmFkLmJhdGNoX3BlbmRpbmcsIHBlbmRpbmdf Y291bnQpOwogCi0JYXNzZXJ0X3Jlc2V0X3N0YXR1cyhmZCwgZmQsIGN0eF9nb29kLCBSU19CQVRD SF9QRU5ESU5HKTsKKwlhc3NlcnRfcmVzZXRfc3RhdHVzKGZkLCBmZCwgY3R4X2dvb2QsIFJTX05P X0VSUk9SKTsKIAlpZ3RfYXNzZXJ0X2VxKGdlbV9yZXNldF9zdGF0cyhmZCwgY3R4X2dvb2QsICZy c19nb29kKSwgMCk7CiAJaWd0X2Fzc2VydF9lcShyc19nb29kLmJhdGNoX2FjdGl2ZSwgMCk7Ci0J aWd0X2Fzc2VydF9lcShyc19nb29kLmJhdGNoX3BlbmRpbmcsIDIpOwogCiAJY2xvc2UoZmQpOwog fQotLSAKMi4xMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK