From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v9 11/21] drm/i915/selftests: reset engine self tests Date: Thu, 15 Jun 2017 13:18:18 -0700 Message-ID: <20170615201828.23144-12-michel.thierry@intel.com> References: <20170615201828.23144-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 260CE6E80E for ; Thu, 15 Jun 2017 20:18:32 +0000 (UTC) In-Reply-To: <20170615201828.23144-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 YXNlLgp2MzogdXNlIFJFU0VUX0VOR0lORV9JTl9QUk9HUkVTUyBmbGFnLgp2NDogdXNlIEk5MTVf UkVTRVRfRU5HSU5FIGZsYWcuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVs LnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9p bnRlbF9oYW5nY2hlY2suYyB8IDE1MCArKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNo YW5nZWQsIDE1MCBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2Vs ZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jCmluZGV4IGFhMzFkNmMwY2RmYi4uZjU0YjMyZDliNTBj IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfaGFuZ2No ZWNrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVj ay5jCkBAIC0zMjIsNiArMzIyLDU3IEBAIHN0YXRpYyBpbnQgaWd0X2dsb2JhbF9yZXNldCh2b2lk ICphcmcpCiAJcmV0dXJuIGVycjsKIH0KIAorc3RhdGljIGludCBpZ3RfcmVzZXRfZW5naW5lKHZv aWQgKmFyZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGFyZzsKKwlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJ dW5zaWduZWQgaW50IHJlc2V0X2NvdW50LCByZXNldF9lbmdpbmVfY291bnQ7CisJaW50IGVyciA9 IDA7CisKKwkvKiBDaGVjayB0aGF0IHdlIGNhbiBpc3N1ZSBhIGdsb2JhbCBHUFUgYW5kIGVuZ2lu ZSByZXNldCAqLworCisJaWYgKCFpbnRlbF9oYXNfZ3B1X3Jlc2V0KGk5MTUpKQorCQlyZXR1cm4g MDsKKworCWlmICghaW50ZWxfaGFzX3Jlc2V0X2VuZ2luZShpOTE1KSkKKwkJcmV0dXJuIDA7CisK Kwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkgeworCQlzZXRfYml0KEk5MTVfUkVT RVRfRU5HSU5FICsgZW5naW5lLT5pZCwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisJCXJlc2V0 X2NvdW50ID0gaTkxNV9yZXNldF9jb3VudCgmaTkxNS0+Z3B1X2Vycm9yKTsKKwkJcmVzZXRfZW5n aW5lX2NvdW50ID0gaTkxNV9yZXNldF9lbmdpbmVfY291bnQoJmk5MTUtPmdwdV9lcnJvciwKKwkJ CQkJCQkgICAgIGVuZ2luZSk7CisKKwkJZXJyID0gaTkxNV9yZXNldF9lbmdpbmUoZW5naW5lKTsK KwkJaWYgKGVycikgeworCQkJcHJfZXJyKCJpOTE1X3Jlc2V0X2VuZ2luZSBmYWlsZWRcbiIpOwor CQkJYnJlYWs7CisJCX0KKworCQlpZiAoaTkxNV9yZXNldF9jb3VudCgmaTkxNS0+Z3B1X2Vycm9y KSAhPSByZXNldF9jb3VudCkgeworCQkJcHJfZXJyKCJGdWxsIEdQVSByZXNldCByZWNvcmRlZCEg KGVuZ2luZSByZXNldCBleHBlY3RlZClcbiIpOworCQkJZXJyID0gLUVJTlZBTDsKKwkJCWJyZWFr OworCQl9CisKKwkJaWYgKGk5MTVfcmVzZXRfZW5naW5lX2NvdW50KCZpOTE1LT5ncHVfZXJyb3Is IGVuZ2luZSkgPT0KKwkJICAgIHJlc2V0X2VuZ2luZV9jb3VudCkgeworCQkJcHJfZXJyKCJObyAl cyBlbmdpbmUgcmVzZXQgcmVjb3JkZWQhXG4iLCBlbmdpbmUtPm5hbWUpOworCQkJZXJyID0gLUVJ TlZBTDsKKwkJCWJyZWFrOworCQl9CisKKwkJY2xlYXJfYml0KEk5MTVfUkVTRVRfRU5HSU5FICsg ZW5naW5lLT5pZCwKKwkJCSAgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisJfQorCisJaWYgKGk5 MTVfdGVybWluYWxseV93ZWRnZWQoJmk5MTUtPmdwdV9lcnJvcikpCisJCWVyciA9IC1FSU87CisK KwlyZXR1cm4gZXJyOworfQorCiBzdGF0aWMgdTMyIGZha2VfaGFuZ2NoZWNrKHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7CiAJdTMyIHJlc2V0X2NvdW50OwpAQCAtNTI2LDEzICs1 NzcsMTEyIEBAIHN0YXRpYyBpbnQgaWd0X3Jlc2V0X3F1ZXVlKHZvaWQgKmFyZykKIAlyZXR1cm4g ZXJyOwogfQogCitzdGF0aWMgaW50IGlndF9yZW5kZXJfZW5naW5lX3Jlc2V0X2ZhbGxiYWNrKHZv aWQgKmFyZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGFyZzsKKwlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBpOTE1LT5lbmdpbmVbUkNTXTsKKwlzdHJ1Y3Qg aGFuZyBoOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CisJdW5zaWduZWQgaW50 IHJlc2V0X2NvdW50LCByZXNldF9lbmdpbmVfY291bnQ7CisJaW50IGVyciA9IDA7CisKKwkvKiBD aGVjayB0aGF0IHdlIGNhbiBpc3N1ZSBhIGdsb2JhbCBHUFUgYW5kIGVuZ2luZSByZXNldCAqLwor CisJaWYgKCFpbnRlbF9oYXNfZ3B1X3Jlc2V0KGk5MTUpKQorCQlyZXR1cm4gMDsKKworCWlmICgh aW50ZWxfaGFzX3Jlc2V0X2VuZ2luZShpOTE1KSkKKwkJcmV0dXJuIDA7CisKKwlzZXRfYml0KEk5 MTVfUkVTRVRfQkFDS09GRiwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisJbXV0ZXhfbG9jaygm aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisKKwllcnIgPSBoYW5nX2luaXQoJmgsIGk5MTUpOwor CWlmIChlcnIpCisJCWdvdG8gdW5sb2NrOworCisJcnEgPSBoYW5nX2NyZWF0ZV9yZXF1ZXN0KCZo LCBlbmdpbmUsIGk5MTUtPmtlcm5lbF9jb250ZXh0KTsKKwlpZiAoSVNfRVJSKHJxKSkgeworCQll cnIgPSBQVFJfRVJSKHJxKTsKKwkJZ290byBmaW5pOworCX0KKworCWk5MTVfZ2VtX3JlcXVlc3Rf Z2V0KHJxKTsKKwlfX2k5MTVfYWRkX3JlcXVlc3QocnEsIHRydWUpOworCisJLyogbWFrZSByZXNl dCBlbmdpbmUgZmFpbCAqLworCXJxLT5mZW5jZS5lcnJvciA9IC1FSU87CisKKwlpZiAoIXdhaXRf Zm9yX2hhbmcoJmgsIHJxKSkgeworCQlwcl9lcnIoIkZhaWxlZCB0byBzdGFydCByZXF1ZXN0ICV4 XG4iLCBycS0+ZmVuY2Uuc2Vxbm8pOworCQllcnIgPSAtRUlPOworCQlnb3RvIGZpbmk7CisJfQor CisJcmVzZXRfZW5naW5lX2NvdW50ID0gaTkxNV9yZXNldF9lbmdpbmVfY291bnQoJmk5MTUtPmdw dV9lcnJvciwgZW5naW5lKTsKKwlyZXNldF9jb3VudCA9IGZha2VfaGFuZ2NoZWNrKHJxKTsKKwor CS8qIHVubG9jayBzaW5jZSB3ZSdsbCBjYWxsIGhhbmRsZV9lcnJvciAqLworCW11dGV4X3VubG9j aygmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisJY2xlYXJfYml0KEk5MTVfUkVTRVRfQkFDS09G RiwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisKKwlpOTE1X2hhbmRsZV9lcnJvcihpOTE1LCBp bnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpLCAibGl2ZSB0ZXN0Iik7CisKKwlpZiAoaTkxNV9yZXNl dF9lbmdpbmVfY291bnQoJmk5MTUtPmdwdV9lcnJvciwgZW5naW5lKSAhPQorCSAgICByZXNldF9l bmdpbmVfY291bnQpIHsKKwkJcHJfZXJyKCJyZW5kZXIgZW5naW5lIHJlc2V0IHJlY29yZGVkISAo ZnVsbCByZXNldCBleHBlY3RlZClcbiIpOworCQllcnIgPSAtRUlOVkFMOworCQlnb3RvIGZpbmk7 CisJfQorCisJaWYgKGk5MTVfcmVzZXRfY291bnQoJmk5MTUtPmdwdV9lcnJvcikgPT0gcmVzZXRf Y291bnQpIHsKKwkJcHJfZXJyKCJObyBmdWxsIEdQVSByZXNldCByZWNvcmRlZCFcbiIpOworCQll cnIgPSAtRUlOVkFMOworCQlnb3RvIGZpbmk7CisJfQorCisJLyoKKwkgKiBieSB1c2luZyBmZW5j ZS5lcnJvciA9IC1FSU8sIGZ1bGwgcmVzZXQgc2V0cyB0aGUgd2VkZ2VkIGZsYWcsIGRvIG9uZQor CSAqIG1vcmUgZnVsbCByZXNldCB0byByZS1lbmFibGUgdGhlIGh3LgorCSAqLworCWlmIChpOTE1 X3Rlcm1pbmFsbHlfd2VkZ2VkKCZpOTE1LT5ncHVfZXJyb3IpKSB7CisJCXNldF9iaXQoSTkxNV9S RVNFVF9CQUNLT0ZGLCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKKwkJbXV0ZXhfbG9jaygmaTkx NS0+ZHJtLnN0cnVjdF9tdXRleCk7CisJCXJxLT5mZW5jZS5lcnJvciA9IDA7CisKKwkJc2V0X2Jp dChJOTE1X1JFU0VUX0hBTkRPRkYsICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpOworCQlpOTE1X3Jl c2V0KGk5MTUpOworCQlHRU1fQlVHX09OKHRlc3RfYml0KEk5MTVfUkVTRVRfSEFORE9GRiwKKwkJ CQkgICAgJmk5MTUtPmdwdV9lcnJvci5mbGFncykpOworCisJCWlmIChpOTE1X3Jlc2V0X2NvdW50 KCZpOTE1LT5ncHVfZXJyb3IpID09IHJlc2V0X2NvdW50KSB7CisJCQlwcl9lcnIoIk5vIGZ1bGwg R1BVIHJlc2V0IHJlY29yZGVkIVxuIik7CisJCQllcnIgPSAtRUlOVkFMOworCQkJZ290byBmaW5p OworCQl9CisJfQorCitmaW5pOgorCWhhbmdfZmluaSgmaCk7Cit1bmxvY2s6CisJbXV0ZXhfdW5s b2NrKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKKwljbGVhcl9iaXQoSTkxNV9SRVNFVF9CQUNL T0ZGLCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKKworCWlmIChpOTE1X3Rlcm1pbmFsbHlfd2Vk Z2VkKCZpOTE1LT5ncHVfZXJyb3IpKQorCQlyZXR1cm4gLUVJTzsKKworCXJldHVybiBlcnI7Cit9 CisKIGludCBpbnRlbF9oYW5nY2hlY2tfbGl2ZV9zZWxmdGVzdHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUpCiB7CiAJc3RhdGljIGNvbnN0IHN0cnVjdCBpOTE1X3N1YnRlc3QgdGVzdHNb XSA9IHsKIAkJU1VCVEVTVChpZ3RfaGFuZ19zYW5pdHljaGVjayksCiAJCVNVQlRFU1QoaWd0X2ds b2JhbF9yZXNldCksCisJCVNVQlRFU1QoaWd0X3Jlc2V0X2VuZ2luZSksCiAJCVNVQlRFU1QoaWd0 X3dhaXRfcmVzZXQpLAogCQlTVUJURVNUKGlndF9yZXNldF9xdWV1ZSksCisJCVNVQlRFU1QoaWd0 X3JlbmRlcl9lbmdpbmVfcmVzZXRfZmFsbGJhY2spLAogCX07CiAKIAlpZiAoIWludGVsX2hhc19n cHVfcmVzZXQoaTkxNSkpCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=