From: Mika Kuoppala Subject: [PATCH 1/2] drm/i915: Cancel reset preparations on failed resets Date: Tue, 5 Jun 2018 19:03:56 +0300 Message-ID: <20180605160357.32591-1-mika.kuoppala@linux.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 9FC3A6E4E2 for ; Tue, 5 Jun 2018 16:04:14 +0000 (UTC) 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 T3VyIHJlc2V0IGhhbmRsaW5nIGhhcyBhIHJldHJ5IGxheWVyIGZ1cnRoZXIgdXAgaW4gdGhlCmNo YWluLiBBcyB3ZSBoYXZlIHRvbGQgdGhlIGVuZ2luZSB0byBwcmVwYXJlIGZvciByZXNldCwKYW5k IGZhaWxlZCBpdCwgbWFrZSBzdXJlIHRvIHJlbW92ZSB0aGF0IHByZXBhcmF0aW9uIHNvCnRoYXQg dGhlIG5leHQgYXR0ZW1wdGVkIHJlc2V0IGhhcyBhIGNsZWFuIHNsYXRlIGJ5IHRyaWdnZXJpbmcK YW5vdGhlciBmdWxsIHByZXBhcmUgY3ljbGUgZm9yIHRoZSBlbmdpbmVzLgoKdjI6IHJldCBhcyBp bnQsIHNpbXBsaWZpZWQgY2xlYW51cCAoQ2hyaXMpCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3Vv cHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vu Y29yZS5jIHwgMTQgKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMo KyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBi MzZhM2I1NzM2YTAuLmJiMDNmNmQ4YjNkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMKQEAgLTIwOTMsMjEgKzIwOTMsMjUgQEAgc3RhdGljIGludCBnZW44X3Jlc2V0X2VuZ2luZXMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogewogCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZTsKIAl1bnNpZ25lZCBpbnQgdG1wOworCWludCByZXQ7CiAKLQlmb3JfZWFj aF9lbmdpbmVfbWFza2VkKGVuZ2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXApCi0JCWlm IChnZW44X3Jlc2V0X2VuZ2luZV9zdGFydChlbmdpbmUpKQorCWZvcl9lYWNoX2VuZ2luZV9tYXNr ZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21hc2ssIHRtcCkgeworCQlpZiAoZ2VuOF9yZXNl dF9lbmdpbmVfc3RhcnQoZW5naW5lKSkgeworCQkJcmV0ID0gLUVJTzsKIAkJCWdvdG8gbm90X3Jl YWR5OworCQl9CisJfQogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCi0JCXJldHVy biBnZW4xMV9yZXNldF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzayk7CisJCXJldCA9IGdl bjExX3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrKTsKIAllbHNlCi0JCXJldHVy biBnZW42X3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrKTsKKwkJcmV0ID0gZ2Vu Nl9yZXNldF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzayk7CiAKIG5vdF9yZWFkeToKIAlm b3JfZWFjaF9lbmdpbmVfbWFza2VkKGVuZ2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXAp CiAJCWdlbjhfcmVzZXRfZW5naW5lX2NhbmNlbChlbmdpbmUpOwogCi0JcmV0dXJuIC1FSU87CisJ cmV0dXJuIHJldDsKIH0KIAogdHlwZWRlZiBpbnQgKCpyZXNldF9mdW5jKShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqLCB1bnNpZ25lZCBlbmdpbmVfbWFzayk7Ci0tIAoyLjE3LjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=