From: Michel Thierry Subject: [PATCH v8 10/20] drm/i915/selftests: reset engine self tests Date: Mon, 22 May 2017 10:46:31 -0700 Message-ID: <20170522174641.25354-11-michel.thierry@intel.com> References: <20170522174641.25354-1-michel.thierry@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 CD9746E259 for ; Mon, 22 May 2017 17:46:46 +0000 (UTC) In-Reply-To: <20170522174641.25354-1-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org Q2hlY2sgdGhhdCB3ZSBjYW4gcmVzZXQgc3BlY2lmaWMgZW5naW5lcywgYWxzbyBjaGVjayB0aGUg ZmFsbGJhY2sgdG8KZnVsbCByZXNldCBpZiBzb21ldGhpbmcgZGlkbid0IHdvcmsuCgp2MjogcmVi YXNlLgp2MzogdXNlIFJFU0VUX0VOR0lORV9JTl9QUk9HUkVTUyBmbGFnLgoKU2lnbmVkLW9mZi1i eTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfaGFuZ2NoZWNrLmMgfCAxNDkgKysrKysrKysr KysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxNDkgaW5zZXJ0aW9ucygrKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF9oYW5nY2hlY2suYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF9oYW5nY2hlY2suYwppbmRleCBh YTMxZDZjMGNkZmIuLjhhM2VkYjhiZDQ0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L3NlbGZ0ZXN0cy9pbnRlbF9oYW5nY2hlY2suYwpAQCAtMzIyLDYgKzMyMiw1NiBAQCBzdGF0aWMg aW50IGlndF9nbG9iYWxfcmVzZXQodm9pZCAqYXJnKQogCXJldHVybiBlcnI7CiB9CiAKK3N0YXRp YyBpbnQgaWd0X3Jlc2V0X2VuZ2luZSh2b2lkICphcmcpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUgPSBhcmc7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworCWVu dW0gaW50ZWxfZW5naW5lX2lkIGlkOworCXVuc2lnbmVkIGludCByZXNldF9jb3VudCwgcmVzZXRf ZW5naW5lX2NvdW50OworCWludCBlcnIgPSAwOworCisJLyogQ2hlY2sgdGhhdCB3ZSBjYW4gaXNz dWUgYSBnbG9iYWwgR1BVIGFuZCBlbmdpbmUgcmVzZXQgKi8KKworCWlmICghaW50ZWxfaGFzX2dw dV9yZXNldChpOTE1KSkKKwkJcmV0dXJuIDA7CisKKwlpZiAoIWludGVsX2hhc19yZXNldF9lbmdp bmUoaTkxNSkpCisJCXJldHVybiAwOworCisJc2V0X2JpdChJOTE1X1JFU0VUX0VOR0lORV9JTl9Q Uk9HUkVTUywgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisKKwlmb3JfZWFjaF9lbmdpbmUoZW5n aW5lLCBpOTE1LCBpZCkgeworCQlyZXNldF9jb3VudCA9IGk5MTVfcmVzZXRfY291bnQoJmk5MTUt PmdwdV9lcnJvcik7CisJCXJlc2V0X2VuZ2luZV9jb3VudCA9IGk5MTVfcmVzZXRfZW5naW5lX2Nv dW50KCZpOTE1LT5ncHVfZXJyb3IsCisJCQkJCQkJICAgICBlbmdpbmUpOworCisJCWVyciA9IGk5 MTVfcmVzZXRfZW5naW5lKGVuZ2luZSk7CisJCWlmIChlcnIpIHsKKwkJCXByX2VycigiaTkxNV9y ZXNldF9lbmdpbmUgZmFpbGVkXG4iKTsKKwkJCWJyZWFrOworCQl9CisKKwkJaWYgKGk5MTVfcmVz ZXRfY291bnQoJmk5MTUtPmdwdV9lcnJvcikgIT0gcmVzZXRfY291bnQpIHsKKwkJCXByX2Vycigi RnVsbCBHUFUgcmVzZXQgcmVjb3JkZWQhIChlbmdpbmUgcmVzZXQgZXhwZWN0ZWQpXG4iKTsKKwkJ CWVyciA9IC1FSU5WQUw7CisJCQlicmVhazsKKwkJfQorCisJCWlmIChpOTE1X3Jlc2V0X2VuZ2lu ZV9jb3VudCgmaTkxNS0+Z3B1X2Vycm9yLCBlbmdpbmUpID09CisJCSAgICByZXNldF9lbmdpbmVf Y291bnQpIHsKKwkJCXByX2VycigiTm8gJXMgZW5naW5lIHJlc2V0IHJlY29yZGVkIVxuIiwgZW5n aW5lLT5uYW1lKTsKKwkJCWVyciA9IC1FSU5WQUw7CisJCQlicmVhazsKKwkJfQorCX0KKworCWNs ZWFyX2JpdChJOTE1X1JFU0VUX0VOR0lORV9JTl9QUk9HUkVTUywgJmk5MTUtPmdwdV9lcnJvci5m bGFncyk7CisJaWYgKGk5MTVfdGVybWluYWxseV93ZWRnZWQoJmk5MTUtPmdwdV9lcnJvcikpCisJ CWVyciA9IC1FSU87CisKKwlyZXR1cm4gZXJyOworfQorCiBzdGF0aWMgdTMyIGZha2VfaGFuZ2No ZWNrKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7CiAJdTMyIHJlc2V0X2NvdW50 OwpAQCAtNTI2LDEzICs1NzYsMTEyIEBAIHN0YXRpYyBpbnQgaWd0X3Jlc2V0X3F1ZXVlKHZvaWQg KmFyZykKIAlyZXR1cm4gZXJyOwogfQogCitzdGF0aWMgaW50IGlndF9yZW5kZXJfZW5naW5lX3Jl c2V0X2ZhbGxiYWNrKHZvaWQgKmFyZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSA9IGFyZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBpOTE1LT5lbmdpbmVb UkNTXTsKKwlzdHJ1Y3QgaGFuZyBoOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7 CisJdW5zaWduZWQgaW50IHJlc2V0X2NvdW50LCByZXNldF9lbmdpbmVfY291bnQ7CisJaW50IGVy ciA9IDA7CisKKwkvKiBDaGVjayB0aGF0IHdlIGNhbiBpc3N1ZSBhIGdsb2JhbCBHUFUgYW5kIGVu Z2luZSByZXNldCAqLworCisJaWYgKCFpbnRlbF9oYXNfZ3B1X3Jlc2V0KGk5MTUpKQorCQlyZXR1 cm4gMDsKKworCWlmICghaW50ZWxfaGFzX3Jlc2V0X2VuZ2luZShpOTE1KSkKKwkJcmV0dXJuIDA7 CisKKwlzZXRfYml0KEk5MTVfUkVTRVRfQkFDS09GRiwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7 CisJbXV0ZXhfbG9jaygmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisKKwllcnIgPSBoYW5nX2lu aXQoJmgsIGk5MTUpOworCWlmIChlcnIpCisJCWdvdG8gdW5sb2NrOworCisJcnEgPSBoYW5nX2Ny ZWF0ZV9yZXF1ZXN0KCZoLCBlbmdpbmUsIGk5MTUtPmtlcm5lbF9jb250ZXh0KTsKKwlpZiAoSVNf RVJSKHJxKSkgeworCQllcnIgPSBQVFJfRVJSKHJxKTsKKwkJZ290byBmaW5pOworCX0KKworCWk5 MTVfZ2VtX3JlcXVlc3RfZ2V0KHJxKTsKKwlfX2k5MTVfYWRkX3JlcXVlc3QocnEsIHRydWUpOwor CisJLyogbWFrZSByZXNldCBlbmdpbmUgZmFpbCAqLworCXJxLT5mZW5jZS5lcnJvciA9IC1FSU87 CisKKwlpZiAoIXdhaXRfZm9yX2hhbmcoJmgsIHJxKSkgeworCQlwcl9lcnIoIkZhaWxlZCB0byBz dGFydCByZXF1ZXN0ICV4XG4iLCBycS0+ZmVuY2Uuc2Vxbm8pOworCQllcnIgPSAtRUlPOworCQln b3RvIGZpbmk7CisJfQorCisJcmVzZXRfZW5naW5lX2NvdW50ID0gaTkxNV9yZXNldF9lbmdpbmVf Y291bnQoJmk5MTUtPmdwdV9lcnJvciwgZW5naW5lKTsKKwlyZXNldF9jb3VudCA9IGZha2VfaGFu Z2NoZWNrKHJxKTsKKworCS8qIHVubG9jayBzaW5jZSB3ZSdsbCBjYWxsIGhhbmRsZV9lcnJvciAq LworCW11dGV4X3VubG9jaygmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisJY2xlYXJfYml0KEk5 MTVfUkVTRVRfQkFDS09GRiwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisKKwlpOTE1X2hhbmRs ZV9lcnJvcihpOTE1LCBpbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpLCAibGl2ZSB0ZXN0Iik7CisK KwlpZiAoaTkxNV9yZXNldF9lbmdpbmVfY291bnQoJmk5MTUtPmdwdV9lcnJvciwgZW5naW5lKSAh PQorCSAgICByZXNldF9lbmdpbmVfY291bnQpIHsKKwkJcHJfZXJyKCJyZW5kZXIgZW5naW5lIHJl c2V0IHJlY29yZGVkISAoZnVsbCByZXNldCBleHBlY3RlZClcbiIpOworCQllcnIgPSAtRUlOVkFM OworCQlnb3RvIGZpbmk7CisJfQorCisJaWYgKGk5MTVfcmVzZXRfY291bnQoJmk5MTUtPmdwdV9l cnJvcikgPT0gcmVzZXRfY291bnQpIHsKKwkJcHJfZXJyKCJObyBmdWxsIEdQVSByZXNldCByZWNv cmRlZCFcbiIpOworCQllcnIgPSAtRUlOVkFMOworCQlnb3RvIGZpbmk7CisJfQorCisJLyoKKwkg KiBieSB1c2luZyBmZW5jZS5lcnJvciA9IC1FSU8sIGZ1bGwgcmVzZXQgc2V0cyB0aGUgd2VkZ2Vk IGZsYWcsIGRvIG9uZQorCSAqIG1vcmUgZnVsbCByZXNldCB0byByZS1lbmFibGUgdGhlIGh3Lgor CSAqLworCWlmIChpOTE1X3Rlcm1pbmFsbHlfd2VkZ2VkKCZpOTE1LT5ncHVfZXJyb3IpKSB7CisJ CXNldF9iaXQoSTkxNV9SRVNFVF9CQUNLT0ZGLCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKKwkJ bXV0ZXhfbG9jaygmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisJCXJxLT5mZW5jZS5lcnJvciA9 IDA7CisKKwkJc2V0X2JpdChJOTE1X1JFU0VUX0hBTkRPRkYsICZpOTE1LT5ncHVfZXJyb3IuZmxh Z3MpOworCQlpOTE1X3Jlc2V0KGk5MTUpOworCQlHRU1fQlVHX09OKHRlc3RfYml0KEk5MTVfUkVT RVRfSEFORE9GRiwKKwkJCQkgICAgJmk5MTUtPmdwdV9lcnJvci5mbGFncykpOworCisJCWlmIChp OTE1X3Jlc2V0X2NvdW50KCZpOTE1LT5ncHVfZXJyb3IpID09IHJlc2V0X2NvdW50KSB7CisJCQlw cl9lcnIoIk5vIGZ1bGwgR1BVIHJlc2V0IHJlY29yZGVkIVxuIik7CisJCQllcnIgPSAtRUlOVkFM OworCQkJZ290byBmaW5pOworCQl9CisJfQorCitmaW5pOgorCWhhbmdfZmluaSgmaCk7Cit1bmxv Y2s6CisJbXV0ZXhfdW5sb2NrKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKKwljbGVhcl9iaXQo STkxNV9SRVNFVF9CQUNLT0ZGLCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKKworCWlmIChpOTE1 X3Rlcm1pbmFsbHlfd2VkZ2VkKCZpOTE1LT5ncHVfZXJyb3IpKQorCQlyZXR1cm4gLUVJTzsKKwor CXJldHVybiBlcnI7Cit9CisKIGludCBpbnRlbF9oYW5nY2hlY2tfbGl2ZV9zZWxmdGVzdHMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7CiAJc3RhdGljIGNvbnN0IHN0cnVjdCBpOTE1 X3N1YnRlc3QgdGVzdHNbXSA9IHsKIAkJU1VCVEVTVChpZ3RfaGFuZ19zYW5pdHljaGVjayksCiAJ CVNVQlRFU1QoaWd0X2dsb2JhbF9yZXNldCksCisJCVNVQlRFU1QoaWd0X3Jlc2V0X2VuZ2luZSks CiAJCVNVQlRFU1QoaWd0X3dhaXRfcmVzZXQpLAogCQlTVUJURVNUKGlndF9yZXNldF9xdWV1ZSks CisJCVNVQlRFU1QoaWd0X3JlbmRlcl9lbmdpbmVfcmVzZXRfZmFsbGJhY2spLAogCX07CiAKIAlp ZiAoIWludGVsX2hhc19ncHVfcmVzZXQoaTkxNSkpCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=