From: Mika Kuoppala Subject: [PATCH 1/2] drm/i915: Cancel reset preparations on failed resets Date: Wed, 30 May 2018 18:02:05 +0300 Message-ID: <20180530150206.7798-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8889F6E8F2 for ; Wed, 30 May 2018 15:02:20 +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 YW5vdGhlciBmdWxsIHByZXBhcmUgY3ljbGUgZm9yIHRoZSBlbmdpbmVzLiBOb3RlIHRoYXQgd2l0 aApzdWNjZXNzZnVsIHJlc2V0LCB0aGVyZSBpcyBub3RoaW5nIHRvIGNsZWFudXAuCgpDYzogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1pa2Eg S3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgMjAgKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggYjM2YTNiNTczNmEwLi42OGZlNGMxNmFjZmIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0yMDkyLDIyICsyMDkyLDI2IEBAIHN0YXRp YyBpbnQgZ2VuOF9yZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJCSAgICAgIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQogewogCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZTsKLQl1bnNpZ25lZCBpbnQgdG1wOworCXVuc2lnbmVkIGludCB0bXAsIHJl dDsKIAotCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21h c2ssIHRtcCkKLQkJaWYgKGdlbjhfcmVzZXRfZW5naW5lX3N0YXJ0KGVuZ2luZSkpCisJZm9yX2Vh Y2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVfbWFzaywgdG1wKSB7CisJ CWlmIChnZW44X3Jlc2V0X2VuZ2luZV9zdGFydChlbmdpbmUpKSB7CisJCQlyZXQgPSAtRUlPOwog CQkJZ290byBub3RfcmVhZHk7CisJCX0KKwl9CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSAxMSkKLQkJcmV0dXJuIGdlbjExX3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNr KTsKKwkJcmV0ID0gZ2VuMTFfcmVzZXRfZW5naW5lcyhkZXZfcHJpdiwgZW5naW5lX21hc2spOwog CWVsc2UKLQkJcmV0dXJuIGdlbjZfcmVzZXRfZW5naW5lcyhkZXZfcHJpdiwgZW5naW5lX21hc2sp OworCQlyZXQgPSBnZW42X3Jlc2V0X2VuZ2luZXMoZGV2X3ByaXYsIGVuZ2luZV9tYXNrKTsKIAog bm90X3JlYWR5OgotCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5n aW5lX21hc2ssIHRtcCkKLQkJZ2VuOF9yZXNldF9lbmdpbmVfY2FuY2VsKGVuZ2luZSk7CisJaWYg KHJldCkKKwkJZm9yX2VhY2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVf bWFzaywgdG1wKQorCQkJZ2VuOF9yZXNldF9lbmdpbmVfY2FuY2VsKGVuZ2luZSk7CiAKLQlyZXR1 cm4gLUVJTzsKKwlyZXR1cm4gcmV0OwogfQogCiB0eXBlZGVmIGludCAoKnJlc2V0X2Z1bmMpKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICosIHVuc2lnbmVkIGVuZ2luZV9tYXNrKTsKLS0gCjIuMTcu MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==