From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/2] drm/i915: Detect a failed GPU reset+recovery Date: Mon, 16 Jan 2017 09:42:52 +0000 Message-ID: <20170116094252.26429-2-chris@chris-wilson.co.uk> References: <20170116094252.26429-1-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-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE9AD6E2A0 for ; Mon, 16 Jan 2017 09:42:59 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r144so29479190wme.0 for ; Mon, 16 Jan 2017 01:42:59 -0800 (PST) In-Reply-To: <20170116094252.26429-1-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 dXNlcnMgZnJvbSB0cnlpbmcgdG8gdXNlIHRoZQpicm9rZW4gR1BVLgoKU2lnbmVkLW9mZi1ieTog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxh IDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8ICA3 ICsrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDE0ICsrKysrKysrKysrKy0tCiAzIGZpbGVzIGNo YW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKaW5kZXggYmI3NDdhZWIyOWFhLi41ZWU2Mjk3NmVjOTggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYwpAQCAtMTc2MSw3ICsxNzYxLDEyIEBAIHZvaWQgaTkxNV9yZXNldChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlwcl9ub3RpY2UoImRybS9pOTE1OiBSZXNldHRp bmcgY2hpcCBhZnRlciBncHUgaGFuZ1xuIik7CiAJZGlzYWJsZV9pcnEoZGV2X3ByaXYtPmRybS5p cnEpOwotCWk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoZGV2X3ByaXYpOworCXJldCA9IGk5MTVfZ2Vt X3Jlc2V0X3ByZXBhcmUoZGV2X3ByaXYpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJHUFUg cmVjb3ZlcnkgZmFpbGVkXG4iKTsKKwkJaW50ZWxfZ3B1X3Jlc2V0KGRldl9wcml2LCBBTExfRU5H SU5FUyk7CisJCWdvdG8gZXJyb3I7CisJfQogCiAJcmV0ID0gaW50ZWxfZ3B1X3Jlc2V0KGRldl9w cml2LCBBTExfRU5HSU5FUyk7CiAJaWYgKHJldCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5k ZXggZjg2MTQxODEyMmVmLi4zODUwOTUwNTQyNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA QCAtMzMyOCw3ICszMzI4LDcgQEAgc3RhdGljIGlubGluZSB1MzIgaTkxNV9yZXNldF9jb3VudChz dHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQogCXJldHVybiBSRUFEX09OQ0UoZXJyb3ItPnJl c2V0X2NvdW50KTsKIH0KIAotdm9pZCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdik7CitpbnQgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9yZXNldF9maW5p c2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9nZW1fc2V0 X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dl bV9jbGZsdXNoX29iamVjdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLCBib29sIGZv cmNlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDk0NDUwNjIxZTZjYi4uYmViM2NkN2Uy ZjM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI2MjksMTYgKzI2MjksMjYgQEAgc3Rh dGljIHZvaWQgcmVzZXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QpCiAJZG1hX2ZlbmNlX3NldF9lcnJvcigmcmVxdWVzdC0+ZmVuY2UsIC1FSU8pOwogfQogCi12 b2lkIGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQoraW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGlu dGVsX2VuZ2luZV9pZCBpZDsKKwlpbnQgZXJyID0gMDsKIAogCS8qIEVuc3VyZSBpcnEgaGFuZGxl ciBmaW5pc2hlcywgYW5kIG5vdCBydW4gYWdhaW4uICovCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2lu ZSwgZGV2X3ByaXYsIGlkKQorCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkg eworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CisKIAkJdGFza2xldF9r aWxsKCZlbmdpbmUtPmlycV90YXNrbGV0KTsKIAorCQlyZXF1ZXN0ID0gaTkxNV9nZW1fZmluZF9h Y3RpdmVfcmVxdWVzdChlbmdpbmUpOworCQlpZiAocmVxdWVzdCAmJiByZXF1ZXN0LT5mZW5jZS5l cnJvciA9PSAtRUlPKQorCQkJZXJyID0gLUVJTzsgLyogUHJldmlvdXMgcmVzZXQgZmFpbGVkISAq LworCX0KKwogCWk5MTVfZ2VtX3Jldm9rZV9mZW5jZXMoZGV2X3ByaXYpOworCisJcmV0dXJuIGVy cjsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==