From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915: Detect a failed GPU reset+recovery Date: Mon, 16 Jan 2017 15:00:36 +0000 Message-ID: <20170116150036.27917-1-chris@chris-wilson.co.uk> References: <20170116094252.26429-2-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wj0-x242.google.com (mail-wj0-x242.google.com [IPv6:2a00:1450:400c:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F1E96E365 for ; Mon, 16 Jan 2017 15:00:41 +0000 (UTC) Received: by mail-wj0-x242.google.com with SMTP id i7so722773wjf.2 for ; Mon, 16 Jan 2017 07:00:41 -0800 (PST) In-Reply-To: <20170116094252.26429-2-chris@chris-wilson.co.uk> 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 Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org SWYgd2UgY2FuJ3QgcmVjb3ZlciB0aGUgR1BVIGFmdGVyIHRoZSByZXNldCwgbWFyayBpdCBhcyB3 ZWRnZWQgdG8gY2FuY2VsCnRoZSBvdXRzdGFuZGluZyB0YXNrcyBhbmQgdG8gcHJldmVudCBuZXcg dXNlcnMgZnJvbSB0cnlpbmcgdG8gdXNlIHRoZQpicm9rZW4gR1BVLgoKdjI6IENoZWNrIHRoZSBz YW1lIHJpbmcgaXMgaHVuZyBhZ2FpbiBiZWZvcmUgZGVjbGFyaW5nIHRoZSByZXNldCBicm9rZW4u CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K Q2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpDYzogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jIHwgIDcgKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgMTYgKysrKysrKysr KysrKystLQogMyBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGJiNzQ3YWViMjlhYS4uNWVlNjI5NzZlYzk4 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE3NjEsNyArMTc2MSwxMiBAQCB2b2lkIGk5 MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJcHJfbm90aWNl KCJkcm0vaTkxNTogUmVzZXR0aW5nIGNoaXAgYWZ0ZXIgZ3B1IGhhbmdcbiIpOwogCWRpc2FibGVf aXJxKGRldl9wcml2LT5kcm0uaXJxKTsKLQlpOTE1X2dlbV9yZXNldF9wcmVwYXJlKGRldl9wcml2 KTsKKwlyZXQgPSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKGRldl9wcml2KTsKKwlpZiAocmV0KSB7 CisJCURSTV9FUlJPUigiR1BVIHJlY292ZXJ5IGZhaWxlZFxuIik7CisJCWludGVsX2dwdV9yZXNl dChkZXZfcHJpdiwgQUxMX0VOR0lORVMpOworCQlnb3RvIGVycm9yOworCX0KIAogCXJldCA9IGlu dGVsX2dwdV9yZXNldChkZXZfcHJpdiwgQUxMX0VOR0lORVMpOwogCWlmIChyZXQpIHsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IGY4NjE0MTgxMjJlZi4uMzg1MDk1MDU0MjRkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMzMjgsNyArMzMyOCw3IEBAIHN0YXRpYyBpbmxpbmUgdTMy IGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvcikKIAlyZXR1cm4g UkVBRF9PTkNFKGVycm9yLT5yZXNldF9jb3VudCk7CiB9CiAKLXZvaWQgaTkxNV9nZW1fcmVzZXRf cHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworaW50IGk5MTVfZ2Vt X3Jlc2V0X3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQg aTkxNV9nZW1fcmVzZXRfZmluaXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiB2b2lkIGk5MTVfZ2VtX3NldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKIHZvaWQgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiwgYm9vbCBmb3JjZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAwMjFk MWU5N2NjMTUuLmU5ZGZkMzIwYTBlMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNjI5 LDE2ICsyNjI5LDI4IEBAIHN0YXRpYyB2b2lkIHJlc2V0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWRtYV9mZW5jZV9zZXRfZXJyb3IoJnJlcXVlc3QtPmZl bmNlLCAtRUlPKTsKIH0KIAotdm9pZCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKK2ludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJaW50IGVyciA9IDA7CiAKIAkv KiBFbnN1cmUgaXJxIGhhbmRsZXIgZmluaXNoZXMsIGFuZCBub3QgcnVuIGFnYWluLiAqLwotCWZv cl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKKwlmb3JfZWFjaF9lbmdpbmUoZW5n aW5lLCBkZXZfcHJpdiwgaWQpIHsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0OworCiAJCXRhc2tsZXRfa2lsbCgmZW5naW5lLT5pcnFfdGFza2xldCk7CiAKKwkJaWYgKGVu Z2luZS0+aGFuZ2NoZWNrLnN0YWxsZWQpIHsKKwkJCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2Fj dGl2ZV9yZXF1ZXN0KGVuZ2luZSk7CisJCQlpZiAocmVxdWVzdCAmJiByZXF1ZXN0LT5mZW5jZS5l cnJvciA9PSAtRUlPKQorCQkJCWVyciA9IC1FSU87IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEg Ki8KKwkJfQorCX0KKwogCWk5MTVfZ2VtX3Jldm9rZV9mZW5jZXMoZGV2X3ByaXYpOworCisJcmV0 dXJuIGVycjsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==