From: Michel Thierry Subject: [PATCH v5 11/18] drm/i915/selftests: reset engine self tests Date: Fri, 24 Mar 2017 18:30:03 -0700 Message-ID: <20170325013010.36244-12-michel.thierry@intel.com> References: <20170325013010.36244-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 36AE66EC93 for ; Sat, 25 Mar 2017 01:30:15 +0000 (UTC) In-Reply-To: <20170325013010.36244-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 ZmFsbGJhY2sgdG8KZnVsbCByZXNldCBpZiBzb21ldGhpbmcgZGlkbid0IHdvcmsuCgpTaWduZWQt b2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF9oYW5nY2hlY2suYyB8IDE0NCArKysr KysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDE0NCBpbnNlcnRpb25zKCspCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVj ay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jCmlu ZGV4IDc2ZDVmNzhjMTcyNC4uOTFiNzhlNjM4NDk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfaGFuZ2NoZWNrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvc2VsZnRlc3RzL2ludGVsX2hhbmdjaGVjay5jCkBAIC0zMjMsNiArMzIzLDU2IEBAIHN0 YXRpYyBpbnQgaWd0X2dsb2JhbF9yZXNldCh2b2lkICphcmcpCiAJcmV0dXJuIGVycjsKIH0KIAor c3RhdGljIGludCBpZ3RfcmVzZXRfZW5naW5lKHZvaWQgKmFyZykKK3sKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSA9IGFyZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7 CisJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJdW5zaWduZWQgaW50IHJlc2V0X2NvdW50LCBy ZXNldF9lbmdpbmVfY291bnQ7CisJaW50IGVyciA9IDA7CisKKwkvKiBDaGVjayB0aGF0IHdlIGNh biBpc3N1ZSBhIGdsb2JhbCBHUFUgYW5kIGVuZ2luZSByZXNldCAqLworCisJaWYgKCFpbnRlbF9o YXNfZ3B1X3Jlc2V0KGk5MTUpKQorCQlyZXR1cm4gMDsKKworCWlmICghaW50ZWxfaGFzX3Jlc2V0 X2VuZ2luZShpOTE1KSkKKwkJcmV0dXJuIDA7CisKKwlzZXRfYml0KEk5MTVfUkVTRVRfQkFDS09G RiwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7CisJbXV0ZXhfbG9jaygmaTkxNS0+ZHJtLnN0cnVj dF9tdXRleCk7CisKKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkgeworCQlyZXNl dF9jb3VudCA9IGk5MTVfcmVzZXRfY291bnQoJmk5MTUtPmdwdV9lcnJvcik7CisJCXJlc2V0X2Vu Z2luZV9jb3VudCA9IGk5MTVfcmVzZXRfZW5naW5lX2NvdW50KCZpOTE1LT5ncHVfZXJyb3IsCisJ CQkJCQkJICAgICBlbmdpbmUpOworCisJCXNldF9iaXQoSTkxNV9SRVNFVF9IQU5ET0ZGLCAmaTkx NS0+Z3B1X2Vycm9yLmZsYWdzKTsKKwkJaTkxNV9yZXNldChpOTE1LCBpbnRlbF9lbmdpbmVfZmxh ZyhlbmdpbmUpKTsKKwkJR0VNX0JVR19PTih0ZXN0X2JpdChJOTE1X1JFU0VUX0hBTkRPRkYsICZp OTE1LT5ncHVfZXJyb3IuZmxhZ3MpKTsKKworCQlpZiAoaTkxNV9yZXNldF9jb3VudCgmaTkxNS0+ Z3B1X2Vycm9yKSAhPSByZXNldF9jb3VudCkgeworCQkJcHJfZXJyKCJGdWxsIEdQVSByZXNldCBy ZWNvcmRlZCEgKGVuZ2luZSByZXNldCBleHBlY3RlZClcbiIpOworCQkJZXJyID0gLUVJTlZBTDsK KwkJCWJyZWFrOworCQl9CisKKwkJaWYgKGk5MTVfcmVzZXRfZW5naW5lX2NvdW50KCZpOTE1LT5n cHVfZXJyb3IsIGVuZ2luZSkgPT0KKwkJICAgIHJlc2V0X2VuZ2luZV9jb3VudCkgeworCQkJcHJf ZXJyKCJObyAlcyBlbmdpbmUgcmVzZXQgcmVjb3JkZWQhXG4iLCBlbmdpbmUtPm5hbWUpOworCQkJ ZXJyID0gLUVJTlZBTDsKKwkJCWJyZWFrOworCQl9CisJfQorCW11dGV4X3VubG9jaygmaTkxNS0+ ZHJtLnN0cnVjdF9tdXRleCk7CisKKwljbGVhcl9iaXQoSTkxNV9SRVNFVF9CQUNLT0ZGLCAmaTkx NS0+Z3B1X2Vycm9yLmZsYWdzKTsKKwlpZiAoaTkxNV90ZXJtaW5hbGx5X3dlZGdlZCgmaTkxNS0+ Z3B1X2Vycm9yKSkKKwkJZXJyID0gLUVJTzsKKworCXJldHVybiBlcnI7Cit9CisKIHN0YXRpYyB1 MzIgZmFrZV9oYW5nY2hlY2soc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKIAl1 MzIgcmVzZXRfY291bnQ7CkBAIC01MjcsMTMgKzU3NywxMDcgQEAgc3RhdGljIGludCBpZ3RfcmVz ZXRfcXVldWUodm9pZCAqYXJnKQogCXJldHVybiBlcnI7CiB9CiAKK3N0YXRpYyBpbnQgaWd0X3Jl bmRlcl9lbmdpbmVfcmVzZXRfZmFsbGJhY2sodm9pZCAqYXJnKQoreworCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1ID0gYXJnOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9 IGk5MTUtPmVuZ2luZVtSQ1NdOworCXN0cnVjdCBoYW5nIGg7CisJc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpycTsKKwl1bnNpZ25lZCBpbnQgcmVzZXRfY291bnQsIHJlc2V0X2VuZ2luZV9j b3VudDsKKwlpbnQgZXJyID0gMDsKKworCS8qIENoZWNrIHRoYXQgd2UgY2FuIGlzc3VlIGEgZ2xv YmFsIEdQVSBhbmQgZW5naW5lIHJlc2V0ICovCisKKwlpZiAoIWludGVsX2hhc19ncHVfcmVzZXQo aTkxNSkpCisJCXJldHVybiAwOworCisJaWYgKCFpbnRlbF9oYXNfcmVzZXRfZW5naW5lKGk5MTUp KQorCQlyZXR1cm4gMDsKKworCXNldF9iaXQoSTkxNV9SRVNFVF9CQUNLT0ZGLCAmaTkxNS0+Z3B1 X2Vycm9yLmZsYWdzKTsKKwltdXRleF9sb2NrKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKKwor CWVyciA9IGhhbmdfaW5pdCgmaCwgaTkxNSk7CisJaWYgKGVycikKKwkJZ290byB1bmxvY2s7CisK KwlycSA9IGhhbmdfY3JlYXRlX3JlcXVlc3QoJmgsIGVuZ2luZSwgaTkxNS0+a2VybmVsX2NvbnRl eHQpOworCWlmIChJU19FUlIocnEpKSB7CisJCWVyciA9IFBUUl9FUlIocnEpOworCQlnb3RvIGZp bmk7CisJfQorCisJaTkxNV9nZW1fcmVxdWVzdF9nZXQocnEpOworCV9faTkxNV9hZGRfcmVxdWVz dChycSwgdHJ1ZSk7CisKKwkvKiBtYWtlIHJlc2V0IGVuZ2luZSBmYWlsICovCisJcnEtPmZlbmNl LmVycm9yID0gLUVJTzsKKworCWlmICghd2FpdF9mb3JfaGFuZygmaCwgcnEpKSB7CisJCXByX2Vy cigiRmFpbGVkIHRvIHN0YXJ0IHJlcXVlc3QgJXhcbiIsIHJxLT5mZW5jZS5zZXFubyk7CisJCWVy ciA9IC1FSU87CisJCWdvdG8gZmluaTsKKwl9CisKKwlyZXNldF9lbmdpbmVfY291bnQgPSBpOTE1 X3Jlc2V0X2VuZ2luZV9jb3VudCgmaTkxNS0+Z3B1X2Vycm9yLCBlbmdpbmUpOworCXJlc2V0X2Nv dW50ID0gZmFrZV9oYW5nY2hlY2socnEpOworCisJaTkxNV9yZXNldChpOTE1LCBpbnRlbF9lbmdp bmVfZmxhZyhlbmdpbmUpKTsKKwlHRU1fQlVHX09OKHRlc3RfYml0KEk5MTVfUkVTRVRfSEFORE9G RiwgJmk5MTUtPmdwdV9lcnJvci5mbGFncykpOworCisJaWYgKGk5MTVfcmVzZXRfZW5naW5lX2Nv dW50KCZpOTE1LT5ncHVfZXJyb3IsIGVuZ2luZSkgIT0KKwkgICAgcmVzZXRfZW5naW5lX2NvdW50 KSB7CisJCXByX2VycigicmVuZGVyIGVuZ2luZSByZXNldCByZWNvcmRlZCEgKGZ1bGwgcmVzZXQg ZXhwZWN0ZWQpXG4iKTsKKwkJZXJyID0gLUVJTlZBTDsKKwkJZ290byBmaW5pOworCX0KKworCWlm IChpOTE1X3Jlc2V0X2NvdW50KCZpOTE1LT5ncHVfZXJyb3IpID09IHJlc2V0X2NvdW50KSB7CisJ CXByX2VycigiTm8gZnVsbCBHUFUgcmVzZXQgcmVjb3JkZWQhXG4iKTsKKwkJZXJyID0gLUVJTlZB TDsKKwkJZ290byBmaW5pOworCX0KKworCS8qCisJICogYnkgdXNpbmcgZmVuY2UuZXJyb3IgPSAt RUlPLCBmdWxsIHJlc2V0IHNldHMgdGhlIHdlZGdlZCBmbGFnLCBkbyBvbmUKKwkgKiBtb3JlIGZ1 bGwgcmVzZXQgdG8gcmUtZW5hYmxlIHRoZSBody4KKwkgKi8KKwlpZiAoaTkxNV90ZXJtaW5hbGx5 X3dlZGdlZCgmaTkxNS0+Z3B1X2Vycm9yKSkgeworCQlycS0+ZmVuY2UuZXJyb3IgPSAwOworCisJ CXNldF9iaXQoSTkxNV9SRVNFVF9IQU5ET0ZGLCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKKwkJ aTkxNV9yZXNldChpOTE1LCBBTExfRU5HSU5FUyk7CisJCUdFTV9CVUdfT04odGVzdF9iaXQoSTkx NV9SRVNFVF9IQU5ET0ZGLAorCQkJCSAgICAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKSk7CisKKwkJ aWYgKGk5MTVfcmVzZXRfY291bnQoJmk5MTUtPmdwdV9lcnJvcikgPT0gcmVzZXRfY291bnQpIHsK KwkJCXByX2VycigiTm8gZnVsbCBHUFUgcmVzZXQgcmVjb3JkZWQhXG4iKTsKKwkJCWVyciA9IC1F SU5WQUw7CisJCQlnb3RvIGZpbmk7CisJCX0KKwl9CisKK2Zpbmk6CisJaGFuZ19maW5pKCZoKTsK K3VubG9jazoKKwltdXRleF91bmxvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOworCWNsZWFy X2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpOworCisJaWYg KGk5MTVfdGVybWluYWxseV93ZWRnZWQoJmk5MTUtPmdwdV9lcnJvcikpCisJCXJldHVybiAtRUlP OworCisJcmV0dXJuIGVycjsKK30KKwogaW50IGludGVsX2hhbmdjaGVja19saXZlX3NlbGZ0ZXN0 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKIAlzdGF0aWMgY29uc3Qgc3RydWN0 IGk5MTVfc3VidGVzdCB0ZXN0c1tdID0gewogCQlTVUJURVNUKGlndF9oYW5nX3Nhbml0eWNoZWNr KSwKIAkJU1VCVEVTVChpZ3RfZ2xvYmFsX3Jlc2V0KSwKKwkJU1VCVEVTVChpZ3RfcmVzZXRfZW5n aW5lKSwKIAkJU1VCVEVTVChpZ3Rfd2FpdF9yZXNldCksCiAJCVNVQlRFU1QoaWd0X3Jlc2V0X3F1 ZXVlKSwKKwkJU1VCVEVTVChpZ3RfcmVuZGVyX2VuZ2luZV9yZXNldF9mYWxsYmFjayksCiAJfTsK IAogCWlmICghaW50ZWxfaGFzX2dwdV9yZXNldChpOTE1KSkKLS0gCjIuMTEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==