From: Mika Kuoppala Subject: [PATCH v2 2/2] drm/i915/g4x: Improve gpu reset reliability Date: Thu, 18 May 2017 17:28:41 +0300 Message-ID: <20170518142841.30348-1-mika.kuoppala@intel.com> References: <20170518123422.9428-2-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B54F6E08D for ; Thu, 18 May 2017 14:29:19 +0000 (UTC) In-Reply-To: <20170518123422.9428-2-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 CmRvZXMgaGF2ZSBhbiBlZmZlY3Qgb24gcmVzZXQgcmVsaWFiaWxpdHkuIFRoaXMgcGF0Y2ggbWFr ZXMKcmVzZXQgc3VjY2VzZnVsIG9uIGhhbmdzIGluZHVjZWQgYnkgY2hhaW5lZCBiYXRjaGVzICh0 aGUgaWd0IG9uZXMpLgpOb3RlIHRoYXQgaWYgdGhlIGhhbmcgaXMgaW5zaWRlIGEgc2hhZGVyLCBp dCBpcyBwb3NzaWJsZQp0aGF0IG91ciBhdHRlbXB0cyB0byBzdG9wIHRoZSByaW5nIGFjaGlldmVz IGFueXRoaW5nLgoKdjI6IHplcm8gY3RsLGhlYWQsdGFpbCBhbHNvLiBidWcgcmVmLiB1c2UgZHJp dmVyIGRlYnVncyAoQ2hyaXMpCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTQyClRlc3RjYXNlOiBpZ3QvZ2VtX2J1c3kvKi1oYW5nClRl c3RjYXNlOiBpZ3QvZ2VtX3JpbmdmaWxsL2hhbmctKgpTdWdnZXN0ZWQtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+CkNjOiBUb21pIFNhcnZlbGEgPHRvbWkucC5zYXJ2ZWxhQGludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCAzNSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlv bnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDdlYWFmMjIyNWUxYS4u NDNkYTg0YmUwMzIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNv cmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTQyNyw2 ICsxNDI3LDM1IEBAIGludCBpOTE1X3JlZ19yZWFkX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGljIHZvaWQgZ2VuM19zdG9wX3JpbmdzKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmU7CisJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisKKwlmb3JfZWFjaF9lbmdpbmUo ZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKKwkJY29uc3QgdTMyIGJhc2UgPSBlbmdpbmUtPm1taW9f YmFzZTsKKwkJY29uc3QgaTkxNV9yZWdfdCBtb2RlID0gUklOR19NSV9NT0RFKGJhc2UpOworCisJ CUk5MTVfV1JJVEVfRlcobW9kZSwgX01BU0tFRF9CSVRfRU5BQkxFKFNUT1BfUklORykpOworCQlp ZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXJfZncoZGV2X3ByaXYsCisJCQkJCSAgICAgICBtb2Rl LAorCQkJCQkgICAgICAgTU9ERV9JRExFLAorCQkJCQkgICAgICAgTU9ERV9JRExFLAorCQkJCQkg ICAgICAgNTAwKSkKKwkJCURSTV9ERUJVR19EUklWRVIoIiVzOiB0aW1lZCBvdXQgb24gU1RPUF9S SU5HXG4iLAorCQkJCQkgZW5naW5lLT5uYW1lKTsKKworCQlJOTE1X1dSSVRFX0ZXKFJJTkdfQ1RM KGJhc2UpLCAwKTsKKwkJSTkxNV9XUklURV9GVyhSSU5HX0hFQUQoYmFzZSksIDApOworCQlJOTE1 X1dSSVRFX0ZXKFJJTkdfVEFJTChiYXNlKSwgMCk7CisKKwkJLyogQ2hlY2sgYWN0cyBhcyBhIHBv c3QgKi8KKwkJaWYgKEk5MTVfUkVBRF9GVyhSSU5HX0hFQUQoYmFzZSkpICE9IDApCisJCQlEUk1f REVCVUdfRFJJVkVSKCIlczogcmluZyBoZWFkIG5vdCBwYXJrZWRcbiIsCisJCQkJCSBlbmdpbmUt Pm5hbWUpOworCX0KK30KKwogc3RhdGljIGJvb2wgaTkxNV9yZXNldF9jb21wbGV0ZShzdHJ1Y3Qg cGNpX2RldiAqcGRldikKIHsKIAl1OCBnZHJzdDsKQEAgLTE0NzIsNiArMTUwMSwxMiBAQCBzdGF0 aWMgaW50IGc0eF9kb19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVu c2lnbmVkIGVuZ2luZV9tYXNrKQogCUk5MTVfV1JJVEUoVkRFQ0NMS19HQVRFX0QsIEk5MTVfUkVB RChWREVDQ0xLX0dBVEVfRCkgfCBWQ1BfVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOwogCVBPU1RJ TkdfUkVBRChWREVDQ0xLX0dBVEVfRCk7CiAKKwkvKiBXZSBzdG9wIGVuZ2luZXMsIG90aGVyd2lz ZSB3ZSBtaWdodCBnZXQgZmFpbGVkIHJlc2V0IGFuZCBhCisJICogZGVhZCBncHUgKG9uIGVsayku CisJICovCisJLyogV2FNZWRpYVJlc2V0TWFpblJpbmdDbGVhbnVwOmN0ZyxlbGsgKHN1cHBvc2Vk bHkpICovCisJZ2VuM19zdG9wX3JpbmdzKGRldl9wcml2KTsKKwogCXBjaV93cml0ZV9jb25maWdf Ynl0ZShwZGV2LCBJOTE1X0dEUlNULAogCQkJICAgICAgR1JET01fTUVESUEgfCBHUkRPTV9SRVNF VF9FTkFCTEUpOwogCXJldCA9ICB3YWl0X2ZvcihnNHhfcmVzZXRfY29tcGxldGUocGRldiksIDUw MCk7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=