From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH v2] drm/i915: Optionally disable automatic recovery after a GPU reset Date: Thu, 04 Oct 2018 12:58:01 +0300 Message-ID: <877eiykp92.fsf@gaia.fi.intel.com> References: <20181002190702.16069-1-chris@chris-wilson.co.uk> <20181003105952.11100-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 mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 769236E5B4 for ; Thu, 4 Oct 2018 09:58:33 +0000 (UTC) In-Reply-To: <20181003105952.11100-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: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: Kenneth Graunke List-Id: intel-gfx@lists.freedesktop.org Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gU29tZSBj bGllbnRzLCBzdWNoIGFzIG1lc2EsIG1heSBvbmx5IGVtaXQgbWluaW1hbCBpbmNyZW1lbnRhbCBi YXRjaGVzCj4gdGhhdCByZWx5IG9uIHRoZSBsb2dpY2FsIGNvbnRleHQgc3RhdGUgZnJvbSBwcmV2 aW91cyBiYXRjaGVzLiBUaGV5IGtub3cKPiB0aGF0IHJlY292ZXJ5IGlzIGltcG9zc2libGUgYWZ0 ZXIgYSBoYW5nIGFzIHRoZWlyIHJlcXVpcmVkIEdQVSBzdGF0ZSBpcwo+IGxvc3QsIGFuZCB0aGF0 IGVhY2ggaW4gZmxpZ2h0IGFuZCBzdWJzZXF1ZW50IGJhdGNoIHdpbGwgaGFuZyAocmVzZXR0aW5n Cj4gdGhlIGNvbnRleHQgaW1hZ2UgYmFjayB0byBkZWZhdWx0IHBlcnBldHVhdGluZyB0aGUgcHJv YmxlbSkuCj4KPiBUbyBhdm9pZCBnZXR0aW5nIGludG8gdGhlIHN0YXRlIGluIHRoZSBmaXJzdCBw bGFjZSwgd2UgY2FuIGFsbG93IGNsaWVudHMKPiB0byBvcHQgb3V0IG9mIGF1dG9tYXRpYyByZWNv dmVyeSBhbmQgZWxlY3QgdG8gYmFuIGFueSBndWlsdHkgY29udGV4dAo+IGZvbGxvd2luZyBhIGhh bmcuIFRoaXMgcHJldmVudHMgdGhlIGNvbnRpbnVhbCBzdHJlYW0gb2YgaGFuZ3MgYW5kIGFsbG93 cwo+IHRoZSBjbGllbnQgdG8gcmVjcmVhdGUgdGhlaXIgY29udGV4dCBhbmQgcmVidWlsZCB0aGUg c3RhdGUgZnJvbSBzY3JhdGNoLgo+Cj4gdjI6IFByZWZlciBjYWxsaW5nIGl0IHJlY292ZXJhYmxl IHJhdGhlciB0aGFuIHVucmVjb3ZlcmFibGUuCj4KCk9rLiBZb3Ugd2VudCBmb3J3YXJkIHdpdGgg dGhpcy4gSSBhbSBmaW5lIHdpdGggYm90aApmbGF2b3VycywKClJldmlld2VkLWJ5OiBNaWthIEt1 b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KCj4gU2lnbmVkLW9mZi1ieTog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gQ2M6IEtlbm5ldGggR3Jh dW5rZSA8a2VubmV0aEB3aGl0ZWNhcGUub3JnPgo+IENjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1 b3BwYWxhQGludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgIHwgIDMgKystCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRl eHQuYyB8IDEzICsrKysrKysrKysrKysKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5oIHwgMTYgKysrKysrKysrKysrKysrKwo+ICBpbmNsdWRlL3VhcGkvZHJtL2k5MTVf ZHJtLmggICAgICAgICAgICAgfCAyMCArKysrKysrKysrKysrKysrKysrKwo+ICA0IGZpbGVzIGNo YW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPgo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwo+IGluZGV4IDdkNDVlNzExMDBiYy4uOWIwMmQ3MGZiYWJmIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCj4gQEAgLTMwMTgsNyArMzAxOCw4IEBAIHN0YXRpYyB2b2lkIGk5MTVf Z2VtX2NvbnRleHRfbWFya19ndWlsdHkoc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKPiAg Cj4gIAliYW5uYWJsZSA9IGk5MTVfZ2VtX2NvbnRleHRfaXNfYmFubmFibGUoY3R4KTsKPiAgCXNj b3JlID0gYXRvbWljX2FkZF9yZXR1cm4oQ09OVEVYVF9TQ09SRV9HVUlMVFksICZjdHgtPmJhbl9z Y29yZSk7Cj4gLQliYW5uZWQgPSBzY29yZSA+PSBDT05URVhUX1NDT1JFX0JBTl9USFJFU0hPTEQ7 Cj4gKwliYW5uZWQgPSAoIWk5MTVfZ2VtX2NvbnRleHRfaXNfcmVjb3ZlcmFibGUoY3R4KSB8fAo+ ICsJCSAgc2NvcmUgPj0gQ09OVEVYVF9TQ09SRV9CQU5fVEhSRVNIT0xEKTsKPiAgCj4gIAkvKiBD b29sIGNvbnRleHRzIGRvbid0IGFjY3VtdWxhdGUgY2xpZW50IGJhbiBzY29yZSAqLwo+ICAJaWYg KCFiYW5uYWJsZSkKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCj4gaW5k ZXggOGNiZTU4MDcwNTYxLi5iMzFkYTAzNzVjOGMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCj4gQEAgLTMzOCw2ICszMzgsNyBAQCBfX2NyZWF0ZV9od19jb250 ZXh0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgCWxpc3RfYWRkX3RhaWwo JmN0eC0+bGluaywgJmRldl9wcml2LT5jb250ZXh0cy5saXN0KTsKPiAgCWN0eC0+aTkxNSA9IGRl dl9wcml2Owo+ICAJY3R4LT5zY2hlZC5wcmlvcml0eSA9IEk5MTVfVVNFUl9QUklPUklUWShJOTE1 X1BSSU9SSVRZX05PUk1BTCk7Cj4gKwljdHgtPnVzZXJfZmxhZ3MgPSBCSVQoVUNPTlRFWFRfUkVD T1ZFUkFCTEUpOwo+ICAKPiAgCWZvciAobiA9IDA7IG4gPCBBUlJBWV9TSVpFKGN0eC0+X19lbmdp bmUpOyBuKyspIHsKPiAgCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UgPSAmY3R4LT5fX2VuZ2lu ZVtuXTsKPiBAQCAtODc4LDYgKzg3OSw5IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2dldHBhcmFt X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gIAljYXNlIEk5MTVf Q09OVEVYVF9QQVJBTV9CQU5OQUJMRToKPiAgCQlhcmdzLT52YWx1ZSA9IGk5MTVfZ2VtX2NvbnRl eHRfaXNfYmFubmFibGUoY3R4KTsKPiAgCQlicmVhazsKPiArCWNhc2UgSTkxNV9DT05URVhUX1BB UkFNX1JFQ09WRVJBQkxFOgo+ICsJCWFyZ3MtPnZhbHVlID0gaTkxNV9nZW1fY29udGV4dF9pc19y ZWNvdmVyYWJsZShjdHgpOwo+ICsJCWJyZWFrOwo+ICAJY2FzZSBJOTE1X0NPTlRFWFRfUEFSQU1f UFJJT1JJVFk6Cj4gIAkJYXJncy0+dmFsdWUgPSBjdHgtPnNjaGVkLnByaW9yaXR5ID4+IEk5MTVf VVNFUl9QUklPUklUWV9TSElGVDsKPiAgCQlicmVhazsKPiBAQCAtOTMzLDYgKzkzNywxNSBAQCBp bnQgaTkxNV9nZW1fY29udGV4dF9zZXRwYXJhbV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB2b2lkICpkYXRhLAo+ICAJCQlpOTE1X2dlbV9jb250ZXh0X2NsZWFyX2Jhbm5hYmxlKGN0eCk7 Cj4gIAkJYnJlYWs7Cj4gIAo+ICsJY2FzZSBJOTE1X0NPTlRFWFRfUEFSQU1fUkVDT1ZFUkFCTEU6 Cj4gKwkJaWYgKGFyZ3MtPnNpemUpCj4gKwkJCXJldCA9IC1FSU5WQUw7Cj4gKwkJZWxzZSBpZiAo YXJncy0+dmFsdWUpCj4gKwkJCWk5MTVfZ2VtX2NvbnRleHRfc2V0X3JlY292ZXJhYmxlKGN0eCk7 Cj4gKwkJZWxzZQo+ICsJCQlpOTE1X2dlbV9jb250ZXh0X2NsZWFyX3JlY292ZXJhYmxlKGN0eCk7 Cj4gKwkJYnJlYWs7Cj4gKwo+ICAJY2FzZSBJOTE1X0NPTlRFWFRfUEFSQU1fUFJJT1JJVFk6Cj4g IAkJewo+ICAJCQlzNjQgcHJpb3JpdHkgPSBhcmdzLT52YWx1ZTsKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5oCj4gaW5kZXggMDgxNjVmNmEwYTg0Li4zOTdkNTBiODI2ZDcg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCj4gQEAgLTEyMyw2 ICsxMjMsNyBAQCBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCB7Cj4gICNkZWZpbmUgVUNPTlRFWFRf Tk9fWkVST01BUAkJMAo+ICAjZGVmaW5lIFVDT05URVhUX05PX0VSUk9SX0NBUFRVUkUJMQo+ICAj ZGVmaW5lIFVDT05URVhUX0JBTk5BQkxFCQkyCj4gKyNkZWZpbmUgVUNPTlRFWFRfUkVDT1ZFUkFC TEUJCTMKPiAgCj4gIAkvKioKPiAgCSAqIEBmbGFnczogc21hbGwgc2V0IG9mIGJvb2xlYW5zCj4g QEAgLTI0Nyw2ICsyNDgsMjEgQEAgc3RhdGljIGlubGluZSB2b2lkIGk5MTVfZ2VtX2NvbnRleHRf Y2xlYXJfYmFubmFibGUoc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKPiAgCWNsZWFyX2Jp dChVQ09OVEVYVF9CQU5OQUJMRSwgJmN0eC0+dXNlcl9mbGFncyk7Cj4gIH0KPiAgCj4gK3N0YXRp YyBpbmxpbmUgYm9vbCBpOTE1X2dlbV9jb250ZXh0X2lzX3JlY292ZXJhYmxlKGNvbnN0IHN0cnVj dCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpCj4gK3sKPiArCXJldHVybiB0ZXN0X2JpdChVQ09OVEVY VF9SRUNPVkVSQUJMRSwgJmN0eC0+dXNlcl9mbGFncyk7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxp bmUgdm9pZCBpOTE1X2dlbV9jb250ZXh0X3NldF9yZWNvdmVyYWJsZShzdHJ1Y3QgaTkxNV9nZW1f Y29udGV4dCAqY3R4KQo+ICt7Cj4gKwlzZXRfYml0KFVDT05URVhUX1JFQ09WRVJBQkxFLCAmY3R4 LT51c2VyX2ZsYWdzKTsKPiArfQo+ICsKPiArc3RhdGljIGlubGluZSB2b2lkIGk5MTVfZ2VtX2Nv bnRleHRfY2xlYXJfcmVjb3ZlcmFibGUoc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKPiAr ewo+ICsJY2xlYXJfYml0KFVDT05URVhUX1JFQ09WRVJBQkxFLCAmY3R4LT51c2VyX2ZsYWdzKTsK PiArfQo+ICsKPiAgc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2VtX2NvbnRleHRfaXNfYmFubmVk KGNvbnN0IHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpCj4gIHsKPiAgCXJldHVybiB0ZXN0 X2JpdChDT05URVhUX0JBTk5FRCwgJmN0eC0+ZmxhZ3MpOwo+IGRpZmYgLS1naXQgYS9pbmNsdWRl L3VhcGkvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKPiBpbmRl eCAyOThiMmUxOTc3NDQuLmVlYjI1OGExMmI5NSAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL3VhcGkv ZHJtL2k5MTVfZHJtLmgKPiArKysgYi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKPiBAQCAt MTQ4Niw2ICsxNDg2LDI2IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fY29udGV4dF9wYXJhbSB7Cj4g ICNkZWZpbmUgICBJOTE1X0NPTlRFWFRfTUFYX1VTRVJfUFJJT1JJVFkJMTAyMyAvKiBpbmNsdXNp dmUgKi8KPiAgI2RlZmluZSAgIEk5MTVfQ09OVEVYVF9ERUZBVUxUX1BSSU9SSVRZCQkwCj4gICNk ZWZpbmUgICBJOTE1X0NPTlRFWFRfTUlOX1VTRVJfUFJJT1JJVFkJLTEwMjMgLyogaW5jbHVzaXZl ICovCj4gKwo+ICsvKgo+ICsgKiBOb3QgYWxsIGNsaWVudHMgbWF5IHdhbnQgdG8gYXR0ZW1wdCBh dXRvbWF0aWMgcmVjb3ZlciBvZiBhIGNvbnRleHQgYWZ0ZXIKPiArICogYSBoYW5nIChmb3IgZXhh bXBsZSwgc29tZSBjbGllbnRzIG1heSBvbmx5IHN1Ym1pdCB2ZXJ5IHNtYWxsIGluY3JlbWVudGFs Cj4gKyAqIGJhdGNoZXMgcmVseWluZyBvbiBrbm93biBsb2dpY2FsIHN0YXRlIG9mIHByZXZpb3Vz IGJhdGNoZXMgd2hpY2ggd2lsbCBuZXZlcgo+ICsgKiByZWNvdmVyIGNvcnJlY3RseSBhbmQgZWFj aCBhdHRlbXB0IHdpbGwgaGFuZyksIGFuZCBzbyB3b3VsZCBwcmVmZXIgdGhhdAo+ICsgKiB0aGUg Y29udGV4dCBpcyBmb3JldmVyIGJhbm5lZCBpbnN0ZWFkLgo+ICsgKgo+ICsgKiBJZiBzZXQgdG8g ZmFsc2UgKDApLCBhZnRlciBhIHJlc2V0LCBzdWJzZXF1ZW50IChhbmQgaW4gZmxpZ2h0KSByZW5k ZXJpbmcKPiArICogZnJvbSB0aGlzIGNvbnRleHQgaXMgZGlzY2FyZGVkLCBhbmQgdGhlIGNsaWVu dCB3aWxsIG5lZWQgdG8gY3JlYXRlIGEgbmV3Cj4gKyAqIGNvbnRleHQgdG8gdXNlIGluc3RlYWQu Cj4gKyAqCj4gKyAqIElmIHNldCB0byB0cnVlICgxKSwgdGhlIGtlcm5lbCB3aWxsIGF1dG9tYXRp Y2FsbHkgYXR0ZW1wdCB0byByZWNvdmVyIHRoZQo+ICsgKiBjb250ZXh0IGJ5IHNraXBwaW5nIHRo ZSBoYW5naW5nIGJhdGNoIGFuZCBleGVjdXRpbmcgdGhlIG5leHQgYmF0Y2ggc3RhcnRpbmcKPiAr ICogZnJvbSB0aGUgZGVmYXVsdCBjb250ZXh0IHN0YXRlIChkaXNjYXJkaW5nIHRoZSBpbmNvbXBs ZXRlIGxvZ2ljYWwgY29udGV4dAo+ICsgKiBzdGF0ZSBsb3N0IGR1ZSB0byB0aGUgcmVzZXQpLgo+ ICsgKgo+ICsgKiBPbiBjcmVhdGlvbiwgYWxsIG5ldyBjb250ZXh0cyBhcmUgbWFya2VkIGFzIHJl Y292ZXJhYmxlLgo+ICsgKi8KPiArI2RlZmluZSBJOTE1X0NPTlRFWFRfUEFSQU1fUkVDT1ZFUkFC TEUJMHg3Cj4gIAlfX3U2NCB2YWx1ZTsKPiAgfTsKPiAgCj4gLS0gCj4gMi4xOS4wCj4KPiBfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBt YWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==