From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 7/8] drm/i915: Serialise resets with wedging Date: Fri, 08 Feb 2019 16:30:17 +0200 Message-ID: <87bm3m2w06.fsf@gaia.fi.intel.com> References: <20190207071829.5574-1-chris@chris-wilson.co.uk> <20190207071829.5574-7-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 05D566E2F0 for ; Fri, 8 Feb 2019 14:30:28 +0000 (UTC) In-Reply-To: <20190207071829.5574-7-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 List-Id: intel-gfx@lists.freedesktop.org Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gUHJldmVu dCBjb25jdXJyZW50IHNldC13ZWRnZSB3aXRoIG9uZ29pbmcgcmVzZXRzIChhbmQgdmljZSB2ZXJz YSkgYnkKPiB0YWtpbmcgdGhlIHNhbWUgd2VkZ2VfbXV0ZXggYXJvdW5kIGJvdGggb3BlcmF0aW9u cy4KPgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgoKUmV2aWV3ZWQtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50 ZWwuY29tPgoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXNldC5jIHwgNjgg KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNDAgaW5z ZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9yZXNldC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXNldC5j Cj4gaW5kZXggYzRmY2I0NTBiZDgwLi45NDk0YjAxNTE4NWEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZXNldC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZXNldC5jCj4gQEAgLTc5NCwxNyArNzk0LDE0IEBAIHN0YXRpYyB2b2lkIG5vcF9zdWJt aXRfcmVxdWVzdChzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0KQo+ICAJaW50ZWxfZW5naW5l X3F1ZXVlX2JyZWFkY3J1bWJzKGVuZ2luZSk7Cj4gIH0KPiAgCj4gLXZvaWQgaTkxNV9nZW1fc2V0 X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiArc3RhdGljIHZvaWQgX19p OTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQo+ICB7Cj4g IAlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmk5MTUtPmdwdV9lcnJvcjsKPiAgCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiAgCWVudW0gaW50ZWxfZW5naW5lX2lkIGlk Owo+ICAKPiAtCW11dGV4X2xvY2soJmVycm9yLT53ZWRnZV9tdXRleCk7Cj4gLQlpZiAodGVzdF9i aXQoSTkxNV9XRURHRUQsICZlcnJvci0+ZmxhZ3MpKSB7Cj4gLQkJbXV0ZXhfdW5sb2NrKCZlcnJv ci0+d2VkZ2VfbXV0ZXgpOwo+ICsJaWYgKHRlc3RfYml0KEk5MTVfV0VER0VELCAmZXJyb3ItPmZs YWdzKSkKPiAgCQlyZXR1cm47Cj4gLQl9Cj4gIAo+ICAJaWYgKEdFTV9TSE9XX0RFQlVHKCkgJiYg IWludGVsX2VuZ2luZXNfYXJlX2lkbGUoaTkxNSkpIHsKPiAgCQlzdHJ1Y3QgZHJtX3ByaW50ZXIg cCA9IGRybV9kZWJ1Z19wcmludGVyKF9fZnVuY19fKTsKPiBAQCAtODUzLDEyICs4NTAsMTggQEAg dm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQo+ ICAJc2V0X2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5mbGFncyk7Cj4gIAo+ICAJR0VNX1RSQUNF KCJlbmRcbiIpOwo+IC0JbXV0ZXhfdW5sb2NrKCZlcnJvci0+d2VkZ2VfbXV0ZXgpOwo+ICt9Cj4g IAo+IC0Jd2FrZV91cF9hbGwoJmVycm9yLT5yZXNldF9xdWV1ZSk7Cj4gK3ZvaWQgaTkxNV9nZW1f c2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiArewo+ICsJc3RydWN0 IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZpOTE1LT5ncHVfZXJyb3I7Cj4gKwo+ICsJbXV0ZXhf bG9jaygmZXJyb3ItPndlZGdlX211dGV4KTsKPiArCV9faTkxNV9nZW1fc2V0X3dlZGdlZChpOTE1 KTsKPiArCW11dGV4X3VubG9jaygmZXJyb3ItPndlZGdlX211dGV4KTsKPiAgfQo+ICAKPiAtYm9v bCBpOTE1X2dlbV91bnNldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCj4g K3N0YXRpYyBib29sIF9faTkxNV9nZW1fdW5zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICppOTE1KQo+ICB7Cj4gIAlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmk5MTUt PmdwdV9lcnJvcjsKPiAgCXN0cnVjdCBpOTE1X3RpbWVsaW5lICp0bDsKPiBAQCAtODY5LDggKzg3 Miw2IEBAIGJvb2wgaTkxNV9nZW1fdW5zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1KQo+ICAJaWYgKCFpOTE1LT5ndC5zY3JhdGNoKSAvKiBOZXZlciBmdWxsIGluaXRpYWxp c2VkLCByZWNvdmVyeSBpbXBvc3NpYmxlICovCj4gIAkJcmV0dXJuIGZhbHNlOwo+ICAKPiAtCW11 dGV4X2xvY2soJmVycm9yLT53ZWRnZV9tdXRleCk7Cj4gLQo+ICAJR0VNX1RSQUNFKCJzdGFydFxu Iik7Cj4gIAo+ICAJLyoKPiBAQCAtOTIxLDExICs5MjIsMjEgQEAgYm9vbCBpOTE1X2dlbV91bnNl dF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCj4gIAlzbXBfbWJfX2JlZm9y ZV9hdG9taWMoKTsgLyogY29tcGxldGUgdGFrZW92ZXIgYmVmb3JlIGVuYWJsaW5nIGV4ZWNidWYg Ki8KPiAgCWNsZWFyX2JpdChJOTE1X1dFREdFRCwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7Cj4g IAo+IC0JbXV0ZXhfdW5sb2NrKCZpOTE1LT5ncHVfZXJyb3Iud2VkZ2VfbXV0ZXgpOwo+IC0KPiAg CXJldHVybiB0cnVlOwo+ICB9Cj4gIAo+ICtib29sIGk5MTVfZ2VtX3Vuc2V0X3dlZGdlZChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiArewo+ICsJc3RydWN0IGk5MTVfZ3B1X2Vycm9y ICplcnJvciA9ICZpOTE1LT5ncHVfZXJyb3I7Cj4gKwlib29sIHJlc3VsdDsKPiArCj4gKwltdXRl eF9sb2NrKCZlcnJvci0+d2VkZ2VfbXV0ZXgpOwo+ICsJcmVzdWx0ID0gX19pOTE1X2dlbV91bnNl dF93ZWRnZWQoaTkxNSk7Cj4gKwltdXRleF91bmxvY2soJmVycm9yLT53ZWRnZV9tdXRleCk7Cj4g Kwo+ICsJcmV0dXJuIHJlc3VsdDsKPiArfQo+ICsKPiAgc3RhdGljIGludCBkb19yZXNldChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgdW5zaWduZWQgaW50IHN0YWxsZWRfbWFzaykKPiAg ewo+ICAJaW50IGVyciwgaTsKPiBAQCAtOTc1LDcgKzk4Niw3IEBAIHZvaWQgaTkxNV9yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKPiAgCUdFTV9CVUdfT04oIXRlc3RfYml0KEk5 MTVfUkVTRVRfQkFDS09GRiwgJmVycm9yLT5mbGFncykpOwo+ICAKPiAgCS8qIENsZWFyIGFueSBw cmV2aW91cyBmYWlsZWQgYXR0ZW1wdHMgYXQgcmVjb3ZlcnkuIFRpbWUgdG8gdHJ5IGFnYWluLiAq Lwo+IC0JaWYgKCFpOTE1X2dlbV91bnNldF93ZWRnZWQoaTkxNSkpCj4gKwlpZiAoIV9faTkxNV9n ZW1fdW5zZXRfd2VkZ2VkKGk5MTUpKQo+ICAJCXJldHVybjsKPiAgCj4gIAlpZiAocmVhc29uKQo+ IEBAIC0xMDM3LDcgKzEwNDgsNyBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUsCj4gIAkgKi8KPiAgCWFkZF90YWludChUQUlOVF9XQVJOLCBMT0NLREVQX1NU SUxMX09LKTsKPiAgZXJyb3I6Cj4gLQlpOTE1X2dlbV9zZXRfd2VkZ2VkKGk5MTUpOwo+ICsJX19p OTE1X2dlbV9zZXRfd2VkZ2VkKGk5MTUpOwo+ICAJZ290byBmaW5pc2g7Cj4gIH0KPiAgCj4gQEAg LTExMjksNyArMTE0MCw5IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfZGV2aWNlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1LAo+ICAJaTkxNV93ZWRnZV9vbl90aW1lb3V0KCZ3LCBpOTE1 LCA1ICogSFopIHsKPiAgCQlpbnRlbF9wcmVwYXJlX3Jlc2V0KGk5MTUpOwo+ICAKPiArCQltdXRl eF9sb2NrKCZlcnJvci0+d2VkZ2VfbXV0ZXgpOwo+ICAJCWk5MTVfcmVzZXQoaTkxNSwgZW5naW5l X21hc2ssIHJlYXNvbik7Cj4gKwkJbXV0ZXhfdW5sb2NrKCZlcnJvci0+d2VkZ2VfbXV0ZXgpOwo+ ICAKPiAgCQlpbnRlbF9maW5pc2hfcmVzZXQoaTkxNSk7Cj4gIAl9Cj4gQEAgLTExOTcsNiArMTIx MCw3IEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUsCj4gIAkJICAgICAgIHVuc2lnbmVkIGxvbmcgZmxhZ3MsCj4gIAkJICAgICAgIGNvbnN0IGNo YXIgKmZtdCwgLi4uKQo+ICB7Cj4gKwlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmk5 MTUtPmdwdV9lcnJvcjsKPiAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiAgCWlu dGVsX3dha2VyZWZfdCB3YWtlcmVmOwo+ICAJdW5zaWduZWQgaW50IHRtcDsKPiBAQCAtMTIzMywy MCArMTI0NywxOSBAQCB2b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICppOTE1LAo+ICAJICogVHJ5IGVuZ2luZSByZXNldCB3aGVuIGF2YWlsYWJsZS4gV2UgZmFs bCBiYWNrIHRvIGZ1bGwgcmVzZXQgaWYKPiAgCSAqIHNpbmdsZSByZXNldCBmYWlscy4KPiAgCSAq Lwo+IC0JaWYgKGludGVsX2hhc19yZXNldF9lbmdpbmUoaTkxNSkgJiYKPiAtCSAgICAhaTkxNV90 ZXJtaW5hbGx5X3dlZGdlZCgmaTkxNS0+Z3B1X2Vycm9yKSkgewo+ICsJaWYgKGludGVsX2hhc19y ZXNldF9lbmdpbmUoaTkxNSkgJiYgIWk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJyb3IpKSB7Cj4g IAkJZm9yX2VhY2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGk5MTUsIGVuZ2luZV9tYXNrLCB0bXAp IHsKPiAgCQkJQlVJTERfQlVHX09OKEk5MTVfUkVTRVRfTU9ERVNFVCA+PSBJOTE1X1JFU0VUX0VO R0lORSk7Cj4gIAkJCWlmICh0ZXN0X2FuZF9zZXRfYml0KEk5MTVfUkVTRVRfRU5HSU5FICsgZW5n aW5lLT5pZCwKPiAtCQkJCQkgICAgICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpKQo+ICsJCQkJCSAg ICAgJmVycm9yLT5mbGFncykpCj4gIAkJCQljb250aW51ZTsKPiAgCj4gIAkJCWlmIChpOTE1X3Jl c2V0X2VuZ2luZShlbmdpbmUsIG1zZykgPT0gMCkKPiAgCQkJCWVuZ2luZV9tYXNrICY9IH5pbnRl bF9lbmdpbmVfZmxhZyhlbmdpbmUpOwo+ICAKPiAgCQkJY2xlYXJfYml0KEk5MTVfUkVTRVRfRU5H SU5FICsgZW5naW5lLT5pZCwKPiAtCQkJCSAgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7Cj4gLQkJ CXdha2VfdXBfYml0KCZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MsCj4gKwkJCQkgICZlcnJvci0+Zmxh Z3MpOwo+ICsJCQl3YWtlX3VwX2JpdCgmZXJyb3ItPmZsYWdzLAo+ICAJCQkJICAgIEk5MTVfUkVT RVRfRU5HSU5FICsgZW5naW5lLT5pZCk7Cj4gIAkJfQo+ICAJfQo+IEBAIC0xMjU1LDEwICsxMjY4 LDkgQEAgdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwKPiAgCQlnb3RvIG91dDsKPiAgCj4gIAkvKiBGdWxsIHJlc2V0IG5lZWRzIHRoZSBtdXRleCwg c3RvcCBhbnkgb3RoZXIgdXNlciB0cnlpbmcgdG8gZG8gc28uICovCj4gLQlpZiAodGVzdF9hbmRf c2V0X2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpKSB7Cj4g LQkJd2FpdF9ldmVudChpOTE1LT5ncHVfZXJyb3IucmVzZXRfcXVldWUsCj4gLQkJCSAgICF0ZXN0 X2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsCj4gLQkJCQkgICAgICZpOTE1LT5ncHVfZXJyb3IuZmxh Z3MpKTsKPiArCWlmICh0ZXN0X2FuZF9zZXRfYml0KEk5MTVfUkVTRVRfQkFDS09GRiwgJmVycm9y LT5mbGFncykpIHsKPiArCQl3YWl0X2V2ZW50KGVycm9yLT5yZXNldF9xdWV1ZSwKPiArCQkJICAg IXRlc3RfYml0KEk5MTVfUkVTRVRfQkFDS09GRiwgJmVycm9yLT5mbGFncykpOwo+ICAJCWdvdG8g b3V0OyAvKiBwaWdneS1iYWNrIG9uIHRoZSBvdGhlciByZXNldCAqLwo+ICAJfQo+ICAKPiBAQCAt MTI2OCw4ICsxMjgwLDggQEAgdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSwKPiAgCS8qIFByZXZlbnQgYW55IG90aGVyIHJlc2V0LWVuZ2luZSBhdHRl bXB0LiAqLwo+ICAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgaTkxNSwgdG1wKSB7Cj4gIAkJd2hp bGUgKHRlc3RfYW5kX3NldF9iaXQoSTkxNV9SRVNFVF9FTkdJTkUgKyBlbmdpbmUtPmlkLAo+IC0J CQkJCSZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpKQo+IC0JCQl3YWl0X29uX2JpdCgmaTkxNS0+Z3B1 X2Vycm9yLmZsYWdzLAo+ICsJCQkJCSZlcnJvci0+ZmxhZ3MpKQo+ICsJCQl3YWl0X29uX2JpdCgm ZXJyb3ItPmZsYWdzLAo+ICAJCQkJICAgIEk5MTVfUkVTRVRfRU5HSU5FICsgZW5naW5lLT5pZCwK PiAgCQkJCSAgICBUQVNLX1VOSU5URVJSVVBUSUJMRSk7Cj4gIAl9Cj4gQEAgLTEyNzgsMTEgKzEy OTAsMTEgQEAgdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSwKPiAgCj4gIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCB0bXApIHsKPiAgCQlj bGVhcl9iaXQoSTkxNV9SRVNFVF9FTkdJTkUgKyBlbmdpbmUtPmlkLAo+IC0JCQkgICZpOTE1LT5n cHVfZXJyb3IuZmxhZ3MpOwo+ICsJCQkgICZlcnJvci0+ZmxhZ3MpOwo+ICAJfQo+ICAKPiAtCWNs ZWFyX2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpOwo+IC0J d2FrZV91cF9hbGwoJmk5MTUtPmdwdV9lcnJvci5yZXNldF9xdWV1ZSk7Cj4gKwljbGVhcl9iaXQo STkxNV9SRVNFVF9CQUNLT0ZGLCAmZXJyb3ItPmZsYWdzKTsKPiArCXdha2VfdXBfYWxsKCZlcnJv ci0+cmVzZXRfcXVldWUpOwo+ICAKPiAgb3V0Ogo+ICAJaW50ZWxfcnVudGltZV9wbV9wdXQoaTkx NSwgd2FrZXJlZik7Cj4gLS0gCj4gMi4yMC4xCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=