From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v7 06/20] drm/i915: Add engine reset count to error state Date: Thu, 27 Apr 2017 16:12:46 -0700 Message-ID: <20170427231300.32841-7-michel.thierry@intel.com> References: <20170427231300.32841-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id B666E6E194 for ; Thu, 27 Apr 2017 23:13:02 +0000 (UTC) In-Reply-To: <20170427231300.32841-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 RnJvbTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+CgpEcml2 ZXIgbWFpbnRhaW5zIGNvdW50IG9mIGhvdyBtYW55IHRpbWVzIGEgZ2l2ZW4gZW5naW5lIGlzIHJl c2V0LCB1c2VmdWwgdG8KY2FwdHVyZSB0aGlzIGluIGVycm9yIHN0YXRlIGFsc28uIEl0IGdpdmVz IGFuIGlkZWEgb2YgaG93IGVuZ2luZSBpcyBjb3BpbmcKdXAgd2l0aCB0aGUgd29ya2xvYWRzIGl0 IGlzIGV4ZWN1dGluZyBiZWZvcmUgdGhpcyBlcnJvciBzdGF0ZS4KCkEgZm9sbG93LXVwIHBhdGNo IHdpbGwgcHJvdmlkZSB0aGlzIGluZm9ybWF0aW9uIGluIGRlYnVnZnMuCgp2Mjogcy9lbmdpbmVf cmVzZXQvcmVzZXRfZW5naW5lLyAoQ2hyaXMpCiAgICBEZWZpbmUgY291bnQgYXMgdW5zaWduZWQg aW50IChUdnJ0a28pCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+ClNp Z25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICB8ICAzICsrLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8IDEwICsrKysrKysrKysKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAgMyArKysKIDMgZmlsZXMgY2hhbmdlZCwg MTUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmlu ZGV4IGE2NGU5YjYzY2RiYy4uNDI2ZGI4NzU2ZTk1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK QEAgLTE5NDEsOCArMTk0MSw5IEBAIGludCBpOTE1X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiAJLyogcmVwbGF5IHJlbWFpbmluZyByZXF1ZXN0cyBpbiB0aGUg cXVldWUgKi8KIAlyZXQgPSBlbmdpbmUtPmluaXRfaHcoZW5naW5lKTsKIAlpZiAocmV0KQotCQln b3RvIG91dDsgLy9YWFg6IGlnbm9yZSB0aGlzIGxpbmUgZm9yIG5vdworCQlnb3RvIG91dDsKIAor CWVycm9yLT5yZXNldF9lbmdpbmVfY291bnRbZW5naW5lLT5pZF0rKzsKIG91dDoKIAlyZXR1cm4g cmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4ZTkzMTg5YzIxMDQuLmIwMGVhNTIz YTYzNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC05ODIsNiArOTgyLDcgQEAgc3RydWN0 IGk5MTVfZ3B1X3N0YXRlIHsKIAkJZW51bSBpbnRlbF9lbmdpbmVfaGFuZ2NoZWNrX2FjdGlvbiBo YW5nY2hlY2tfYWN0aW9uOwogCQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsKIAkJaW50 IG51bV9yZXF1ZXN0czsKKwkJdTMyIHJlc2V0X2NvdW50OwogCiAJCS8qIHBvc2l0aW9uIG9mIGFj dGl2ZSByZXF1ZXN0IGluc2lkZSB0aGUgcmluZyAqLwogCQl1MzIgcnFfaGVhZCwgcnFfcG9zdCwg cnFfdGFpbDsKQEAgLTE2MTcsNiArMTYxOCw5IEBAIHN0cnVjdCBpOTE1X2dwdV9lcnJvciB7CiAj ZGVmaW5lIEk5MTVfUkVTRVRfSEFORE9GRgkxCiAjZGVmaW5lIEk5MTVfV0VER0VECQkoQklUU19Q RVJfTE9ORyAtIDEpCiAKKwkvKiogTnVtYmVyIG9mIHRpbWVzIGFuIGVuZ2luZSBoYXMgYmVlbiBy ZXNldCAqLworCXUzMiByZXNldF9lbmdpbmVfY291bnRbSTkxNV9OVU1fRU5HSU5FU107CisKIAkv KioKIAkgKiBXYWl0cXVldWUgdG8gc2lnbmFsIHdoZW4gYSBoYW5nIGlzIGRldGVjdGVkLiBVc2Vk IHRvIGZvciB3YWl0ZXJzCiAJICogdG8gcmVsZWFzZSB0aGUgc3RydWN0X211dGV4IGZvciB0aGUg cmVzZXQgdG8gcHJvY2VkZS4KQEAgLTM0MzksNiArMzQ0MywxMiBAQCBzdGF0aWMgaW5saW5lIHUz MiBpOTE1X3Jlc2V0X2NvdW50KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiAJcmV0dXJu IFJFQURfT05DRShlcnJvci0+cmVzZXRfY291bnQpOwogfQogCitzdGF0aWMgaW5saW5lIHUzMiBp OTE1X3Jlc2V0X2VuZ2luZV9jb3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAorCQkJ CQkgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gUkVBRF9PTkNF KGVycm9yLT5yZXNldF9lbmdpbmVfY291bnRbZW5naW5lLT5pZF0pOworfQorCiBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKgogaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jCmluZGV4IDE0ZTIwNjRiNzY1My4uYTJmZmIxZWYyY2ZhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTQ2Myw2ICs0NjMsNyBAQCBzdGF0aWMgdm9pZCBl cnJvcl9wcmludF9lbmdpbmUoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAll cnJfcHJpbnRmKG0sICIgIGhhbmdjaGVjayBhY3Rpb24gdGltZXN0YW1wOiAlbHUsICV1IG1zIGFn b1xuIiwKIAkJICAgZWUtPmhhbmdjaGVja190aW1lc3RhbXAsCiAJCSAgIGppZmZpZXNfdG9fbXNl Y3MoamlmZmllcyAtIGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wKSk7CisJZXJyX3ByaW50ZihtLCAi ICBlbmdpbmUgcmVzZXQgY291bnQ6ICV1XG4iLCBlZS0+cmVzZXRfY291bnQpOwogCiAJZXJyb3Jf cHJpbnRfcmVxdWVzdChtLCAiICBFTFNQWzBdOiAiLCAmZWUtPmV4ZWNsaXN0WzBdKTsKIAllcnJv cl9wcmludF9yZXF1ZXN0KG0sICIgIEVMU1BbMV06ICIsICZlZS0+ZXhlY2xpc3RbMV0pOwpAQCAt MTI0NCw2ICsxMjQ1LDggQEAgc3RhdGljIHZvaWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9yZWdpc3Rl cnMoc3RydWN0IGk5MTVfZ3B1X3N0YXRlICplcnJvciwKIAllZS0+aGFuZ2NoZWNrX3RpbWVzdGFt cCA9IGVuZ2luZS0+aGFuZ2NoZWNrLmFjdGlvbl90aW1lc3RhbXA7CiAJZWUtPmhhbmdjaGVja19h Y3Rpb24gPSBlbmdpbmUtPmhhbmdjaGVjay5hY3Rpb247CiAJZWUtPmhhbmdjaGVja19zdGFsbGVk ID0gZW5naW5lLT5oYW5nY2hlY2suc3RhbGxlZDsKKwllZS0+cmVzZXRfY291bnQgPSBpOTE1X3Jl c2V0X2VuZ2luZV9jb3VudCgmZGV2X3ByaXYtPmdwdV9lcnJvciwKKwkJCQkJCSAgZW5naW5lKTsK IAogCWlmIChVU0VTX1BQR1RUKGRldl9wcml2KSkgewogCQlpbnQgaTsKLS0gCjIuMTEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==