From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915/g4x: Fix unreliable gpu reset Date: Thu, 18 May 2017 15:34:22 +0300 Message-ID: <20170518123422.9428-2-mika.kuoppala@intel.com> References: <20170518123422.9428-1-mika.kuoppala@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 919966E568 for ; Thu, 18 May 2017 12:35:37 +0000 (UTC) In-Reply-To: <20170518123422.9428-1-mika.kuoppala@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 Cc: Tomi Sarvela List-Id: intel-gfx@lists.freedesktop.org RUxLIHNlZW1zIHRvIHZlcnkgcGlja3kgYWJvdXQgdGhlIHByZWNvbmRpdGlvbnMgdG8gcmVzZXQu CkV2aWRlbmNlIG9uIEVhZ2xlbGFrZSAoODA4NjoyZTEyIChyZXYgMDMpKSBzaG93cyB0aGF0IGl0 IGRvZXMKbm90IGxpa2UgaWYgcmVzZXQgb2NjdXJzIHdoZW4gdGhlcmUgaXMgYWN0aXZlIHJpbmcu CgpWaWxsZSBmb3VuZCBvdXQgdGhhdCB0aGVyZSBpcyB3b3JrYXJvdW5kIHdpdGggbmFtZQonV2FN ZWRpYVJlc2V0TWFpblJpbmdDbGVhbnVwJyB3aGljaCBzdWdnZXN0cyB0aGF0IHdlIG5lZWQgdG8K Y2xlYW51cCByaW5ncyBiZWZvcmUgcmVzZXR0aW5nLiBJdCBpcyB1bmNsZWFyIHdoYXQgY2xlYW51 cApleGFjdGx5IG1lYW5zIGJ1dCBldmlkZW5jZSBzaG93cyB0aGF0IHN0b3BwaW5nIHRoZSByaW5n CmRvZXMgaGF2ZSBhbiBlZmZlY3Qgb24gcmVzZXQgcmVsaWFiaWxpdHkuCgpCdWd6aWxsYTogaHR0 cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTk4ClN1Z2dlc3Rl ZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFRvbWkgU2FydmVsYSA8dG9t aS5wLnNhcnZlbGFAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWth Lmt1b3BwYWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNv cmUuYyB8IDI2ICsrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMjYg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vu Y29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggN2VhYWYy MjI1ZTFhLi4xZDQ3M2NkMWY4YTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBA IC0xNDI3LDYgKzE0MjcsMjYgQEAgaW50IGk5MTVfcmVnX3JlYWRfaW9jdGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9pZCBnZW4zX3N0b3Bfcmlu Z3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZTsKKwllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKworCWZvcl9lYWNo X2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCQljb25zdCBpOTE1X3JlZ190IG1vZGVf ciA9IFJJTkdfTUlfTU9ERShlbmdpbmUtPm1taW9fYmFzZSk7CisKKwkJSTkxNV9XUklURV9GVyht b2RlX3IsIF9NQVNLRURfQklUX0VOQUJMRShTVE9QX1JJTkcpKTsKKwkJaWYgKGludGVsX3dhaXRf Zm9yX3JlZ2lzdGVyX2Z3KGRldl9wcml2LAorCQkJCQkgICAgICAgbW9kZV9yLAorCQkJCQkgICAg ICAgTU9ERV9JRExFLAorCQkJCQkgICAgICAgTU9ERV9JRExFLAorCQkJCQkgICAgICAgMTAwMCkp IHsKKwkJCURSTV9ERUJVRygiJXMgOiB0aW1lZCBvdXQgU1RPUF9SSU5HXG4iLAorCQkJCSAgZW5n aW5lLT5uYW1lKTsKKwkJfQorCX0KK30KKwogc3RhdGljIGJvb2wgaTkxNV9yZXNldF9jb21wbGV0 ZShzdHJ1Y3QgcGNpX2RldiAqcGRldikKIHsKIAl1OCBnZHJzdDsKQEAgLTE0NzIsNiArMTQ5Miwx MiBAQCBzdGF0aWMgaW50IGc0eF9kb19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQogCUk5MTVfV1JJVEUoVkRFQ0NMS19HQVRFX0Qs IEk5MTVfUkVBRChWREVDQ0xLX0dBVEVfRCkgfCBWQ1BfVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUp OwogCVBPU1RJTkdfUkVBRChWREVDQ0xLX0dBVEVfRCk7CiAKKwkvKiBXZSBzdG9wIGVuZ2luZXMs IG90aGVyd2lzZSB3ZSBtaWdodCBnZXQgZmFpbGVkIHJlc2V0IGFuZCBhCisJICogZGVhZCBncHUg KG9uIGVsaykuCisJICovCisJLyogV2FNZWRpYVJlc2V0TWFpblJpbmdDbGVhbnVwOmN0ZyxlbGsg KHN1cHBvc2VkbHkpICovCisJZ2VuM19zdG9wX3JpbmdzKGRldl9wcml2KTsKKwogCXBjaV93cml0 ZV9jb25maWdfYnl0ZShwZGV2LCBJOTE1X0dEUlNULAogCQkJICAgICAgR1JET01fTUVESUEgfCBH UkRPTV9SRVNFVF9FTkFCTEUpOwogCXJldCA9ICB3YWl0X2ZvcihnNHhfcmVzZXRfY29tcGxldGUo cGRldiksIDUwMCk7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=