From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH v2] drm/i915: Actually flush interrupts on reset not just wedging Date: Fri, 23 Mar 2018 14:37:39 +0200 Message-ID: <87vadn3r3g.fsf@gaia.fi.intel.com> References: <20180323090806.13096-1-chris@chris-wilson.co.uk> <20180323101824.14645-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6BDB56E352 for ; Fri, 23 Mar 2018 12:37:45 +0000 (UTC) In-Reply-To: <20180323101824.14645-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 List-Id: intel-gfx@lists.freedesktop.org Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gQ29tbWl0 IDBmMzZhODVjM2JkNSAoImRybS9pOTE1OiBGbHVzaCBwZW5kaW5nIGludGVycnVwdCBmb2xsb3dp bmcgYSBHUFUKPiByZXNldCIpIGdvdCBjb25mdXNlZCBhbmQgb25seSBhcHBsaWVkIHRoZSBmbHVz aCB0byB0aGUgc2V0LXdlZGdlIHBhdGgKPiAod2hpY2ggaXRzZWxmIGlzIHByb3ZpbmcgdHJvdWJs ZXNvbWUpLCBidXQgd2UgYWxzbyBuZWVkIHRoZQo+IHNlcmlhbGlzYXRpb24gb24gdGhlIHJlZ3Vs YXIgcmVzZXQgcGF0aC4gT29wcy4KPgo+IE1vdmUgdGhlIGludGVycnVwdCBpbnRvIHJlc2V0X2ly cSgpIGFuZCBtYWtlIGl0IGNvbW1vbiB0byB0aGUgcmVzZXQgYW5kCj4gZmluYWwgc2V0LXdlZGdl Lgo+Cj4gdjI6IHJlc2V0X2lycSgpIGFmdGVyIHBvcnQgY2FuY2VsbGF0aW9uLCBhcyB3ZSBhc3Nl cnQgdGhhdAo+IGV4ZWNsaXN0cy0+YWN0aXZlIGlzIHNhbmUgZm9yIGNhbmNlbGxhdGlvbiAoYW5k IGlzIGJlaW5nIHJlc2V0IGJ5Cj4gcmVzZXRfaXJxKS4KPgo+IFJlZmVyZW5jZXM6IDBmMzZhODVj M2JkNSAoImRybS9pOTE1OiBGbHVzaCBwZW5kaW5nIGludGVycnVwdCBmb2xsb3dpbmcgYSBHUFUg cmVzZXQiKQo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgo+IENjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNv bT4KPiBDYzogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KPiBDYzog TWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgo+IENjOiBKZWZm IE1jR2VlIDxqZWZmLm1jZ2VlQGludGVsLmNvbT4KClJldmlld2VkLWJ5OiBNaWthIEt1b3BwYWxh IDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIHwgMTA3ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNTQgZGVsZXRpb25z KC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+IGluZGV4IGNlMDljNWFkMzM0Zi4uYjRh YjA2YjA1ZTU4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBAQCAtNzQwLDYgKzc0 MCw1NyBAQCBleGVjbGlzdHNfY2FuY2VsX3BvcnRfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2lu ZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMpCj4gIAl9Cj4gIH0KPiAgCj4gK3N0YXRpYyB2 b2lkIGNsZWFyX2d0aWlyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiArewo+ICsJ c3RhdGljIGNvbnN0IHU4IGd0aWlyW10gPSB7Cj4gKwkJW1JDU10gID0gMCwKPiArCQlbQkNTXSAg PSAwLAo+ICsJCVtWQ1NdICA9IDEsCj4gKwkJW1ZDUzJdID0gMSwKPiArCQlbVkVDU10gPSAzLAo+ ICsJfTsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkx NTsKPiArCWludCBpOwo+ICsKPiArCS8qIFRPRE86IGNvcnJlY3RseSByZXNldCBpcnFzIGZvciBn ZW4xMSAqLwo+ICsJaWYgKFdBUk5fT05fT05DRShJTlRFTF9HRU4oZW5naW5lLT5pOTE1KSA+PSAx MSkpCj4gKwkJcmV0dXJuOwo+ICsKPiArCUdFTV9CVUdfT04oZW5naW5lLT5pZCA+PSBBUlJBWV9T SVpFKGd0aWlyKSk7Cj4gKwo+ICsJLyoKPiArCSAqIENsZWFyIGFueSBwZW5kaW5nIGludGVycnVw dCBzdGF0ZS4KPiArCSAqCj4gKwkgKiBXZSBkbyBpdCB0d2ljZSBvdXQgb2YgcGFyYW5vaWEgdGhh dCBzb21lIG9mIHRoZSBJSVIgYXJlCj4gKwkgKiBkb3VibGUgYnVmZmVyZWQsIGFuZCBzbyBpZiB3 ZSBvbmx5IHJlc2V0IGl0IG9uY2UgdGhlcmUgbWF5Cj4gKwkgKiBzdGlsbCBiZSBhbiBpbnRlcnJ1 cHQgcGVuZGluZy4KPiArCSAqLwo+ICsJZm9yIChpID0gMDsgaSA8IDI7IGkrKykgewo+ICsJCUk5 MTVfV1JJVEUoR0VOOF9HVF9JSVIoZ3RpaXJbZW5naW5lLT5pZF0pLAo+ICsJCQkgICBlbmdpbmUt PmlycV9rZWVwX21hc2spOwo+ICsJCVBPU1RJTkdfUkVBRChHRU44X0dUX0lJUihndGlpcltlbmdp bmUtPmlkXSkpOwo+ICsJfQo+ICsJR0VNX0JVR19PTihJOTE1X1JFQUQoR0VOOF9HVF9JSVIoZ3Rp aXJbZW5naW5lLT5pZF0pKSAmCj4gKwkJICAgZW5naW5lLT5pcnFfa2VlcF9tYXNrKTsKPiArfQo+ ICsKPiArc3RhdGljIHZvaWQgcmVzZXRfaXJxKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKPiArewo+ICsJLyogTWFyayBhbGwgQ1MgaW50ZXJydXB0cyBhcyBjb21wbGV0ZSAqLwo+ICsJ c21wX3N0b3JlX21iKGVuZ2luZS0+ZXhlY2xpc3RzLmFjdGl2ZSwgMCk7Cj4gKwlzeW5jaHJvbml6 ZV9oYXJkaXJxKGVuZ2luZS0+aTkxNS0+ZHJtLmlycSk7Cj4gKwo+ICsJY2xlYXJfZ3RpaXIoZW5n aW5lKTsKPiArCj4gKwkvKgo+ICsJICogVGhlIHBvcnQgaXMgY2hlY2tlZCBwcmlvciB0byBzY2hl ZHVsaW5nIGEgdGFza2xldCwgYnV0Cj4gKwkgKiBqdXN0IGluIGNhc2Ugd2UgaGF2ZSBzdXNwZW5k ZWQgdGhlIHRhc2tsZXQgdG8gZG8gdGhlCj4gKwkgKiB3ZWRnaW5nIG1ha2Ugc3VyZSB0aGF0IHdo ZW4gaXQgd2FrZXMsIGl0IGRlY2lkZXMgdGhlcmUKPiArCSAqIGlzIG5vIHdvcmsgdG8gZG8gYnkg Y2xlYXJpbmcgdGhlIGlycV9wb3N0ZWQgYml0Lgo+ICsJICovCj4gKwljbGVhcl9iaXQoRU5HSU5F X0lSUV9FWEVDTElTVCwgJmVuZ2luZS0+aXJxX3Bvc3RlZCk7Cj4gK30KPiArCj4gIHN0YXRpYyB2 b2lkIGV4ZWNsaXN0c19jYW5jZWxfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQo+ICB7Cj4gIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNs aXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKPiBAQCAtNzY3LDYgKzgxOCw3IEBAIHN0YXRpYyB2 b2lkIGV4ZWNsaXN0c19jYW5jZWxfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQo+ICAKPiAgCS8qIENhbmNlbCB0aGUgcmVxdWVzdHMgb24gdGhlIEhXIGFuZCBjbGVhciB0 aGUgRUxTUCB0cmFja2VyLiAqLwo+ICAJZXhlY2xpc3RzX2NhbmNlbF9wb3J0X3JlcXVlc3RzKGV4 ZWNsaXN0cyk7Cj4gKwlyZXNldF9pcnEoZW5naW5lKTsKPiAgCj4gIAlzcGluX2xvY2soJmVuZ2lu ZS0+dGltZWxpbmUtPmxvY2spOwo+ICAKPiBAQCAtODA1LDE4ICs4NTcsNiBAQCBzdGF0aWMgdm9p ZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKPiAgCj4gIAlzcGluX3VubG9jaygmZW5naW5lLT50aW1lbGluZS0+bG9jayk7Cj4gIAo+IC0J LyogTWFyayBhbGwgQ1MgaW50ZXJydXB0cyBhcyBjb21wbGV0ZSAqLwo+IC0Jc21wX3N0b3JlX21i KGV4ZWNsaXN0cy0+YWN0aXZlLCAwKTsKPiAtCXN5bmNocm9uaXplX2hhcmRpcnEoZW5naW5lLT5p OTE1LT5kcm0uaXJxKTsKPiAtCj4gLQkvKgo+IC0JICogVGhlIHBvcnQgaXMgY2hlY2tlZCBwcmlv ciB0byBzY2hlZHVsaW5nIGEgdGFza2xldCwgYnV0Cj4gLQkgKiBqdXN0IGluIGNhc2Ugd2UgaGF2 ZSBzdXNwZW5kZWQgdGhlIHRhc2tsZXQgdG8gZG8gdGhlCj4gLQkgKiB3ZWRnaW5nIG1ha2Ugc3Vy ZSB0aGF0IHdoZW4gaXQgd2FrZXMsIGl0IGRlY2lkZXMgdGhlcmUKPiAtCSAqIGlzIG5vIHdvcmsg dG8gZG8gYnkgY2xlYXJpbmcgdGhlIGlycV9wb3N0ZWQgYml0Lgo+IC0JICovCj4gLQljbGVhcl9i aXQoRU5HSU5FX0lSUV9FWEVDTElTVCwgJmVuZ2luZS0+aXJxX3Bvc3RlZCk7Cj4gLQo+ICAJbG9j YWxfaXJxX3Jlc3RvcmUoZmxhZ3MpOwo+ICB9Cj4gIAo+IEBAIC0xNTY2LDE0ICsxNjA2LDYgQEAg c3RhdGljIGludCBpbnRlbF9pbml0X3dvcmthcm91bmRfYmIoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQo+ICAJcmV0dXJuIHJldDsKPiAgfQo+ICAKPiAtc3RhdGljIHU4IGd0aWlyW10g PSB7Cj4gLQlbUkNTXSA9IDAsCj4gLQlbQkNTXSA9IDAsCj4gLQlbVkNTXSA9IDEsCj4gLQlbVkNT Ml0gPSAxLAo+IC0JW1ZFQ1NdID0gMywKPiAtfTsKPiAtCj4gIHN0YXRpYyB2b2lkIGVuYWJsZV9l eGVjbGlzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+ICB7Cj4gIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7Cj4gQEAgLTE2NTcsMzUg KzE2ODksNiBAQCBzdGF0aWMgaW50IGdlbjlfaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCj4gIAlyZXR1cm4gaW5pdF93b3JrYXJvdW5kc19yaW5nKGVuZ2lu ZSk7Cj4gIH0KPiAgCj4gLXN0YXRpYyB2b2lkIHJlc2V0X2lycShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCj4gLXsKPiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGVuZ2luZS0+aTkxNTsKPiAtCWludCBpOwo+IC0KPiAtCS8qIFRPRE86IGNvcnJlY3RseSByZXNl dCBpcnFzIGZvciBnZW4xMSAqLwo+IC0JaWYgKFdBUk5fT05fT05DRShJTlRFTF9HRU4oZW5naW5l LT5pOTE1KSA+PSAxMSkpCj4gLQkJcmV0dXJuOwo+IC0KPiAtCUdFTV9CVUdfT04oZW5naW5lLT5p ZCA+PSBBUlJBWV9TSVpFKGd0aWlyKSk7Cj4gLQo+IC0JLyoKPiAtCSAqIENsZWFyIGFueSBwZW5k aW5nIGludGVycnVwdCBzdGF0ZS4KPiAtCSAqCj4gLQkgKiBXZSBkbyBpdCB0d2ljZSBvdXQgb2Yg cGFyYW5vaWEgdGhhdCBzb21lIG9mIHRoZSBJSVIgYXJlIGRvdWJsZQo+IC0JICogYnVmZmVyZWQs IGFuZCBpZiB3ZSBvbmx5IHJlc2V0IGl0IG9uY2UgdGhlcmUgbWF5IHN0aWxsIGJlCj4gLQkgKiBh biBpbnRlcnJ1cHQgcGVuZGluZy4KPiAtCSAqLwo+IC0JZm9yIChpID0gMDsgaSA8IDI7IGkrKykg ewo+IC0JCUk5MTVfV1JJVEUoR0VOOF9HVF9JSVIoZ3RpaXJbZW5naW5lLT5pZF0pLAo+IC0JCQkg ICBlbmdpbmUtPmlycV9rZWVwX21hc2spOwo+IC0JCVBPU1RJTkdfUkVBRChHRU44X0dUX0lJUihn dGlpcltlbmdpbmUtPmlkXSkpOwo+IC0JfQo+IC0JR0VNX0JVR19PTihJOTE1X1JFQUQoR0VOOF9H VF9JSVIoZ3RpaXJbZW5naW5lLT5pZF0pKSAmCj4gLQkJICAgZW5naW5lLT5pcnFfa2VlcF9tYXNr KTsKPiAtCj4gLQljbGVhcl9iaXQoRU5HSU5FX0lSUV9FWEVDTElTVCwgJmVuZ2luZS0+aXJxX3Bv c3RlZCk7Cj4gLX0KPiAtCj4gIHN0YXRpYyB2b2lkIHJlc2V0X2NvbW1vbl9yaW5nKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKPiAgCQkJICAgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAq cmVxdWVzdCkKPiAgewo+IEBAIC0xNjk5LDggKzE3MDIsNiBAQCBzdGF0aWMgdm9pZCByZXNldF9j b21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCj4gIAkvKiBTZWUgZXhl Y2xpc3RzX2NhbmNlbF9yZXF1ZXN0cygpIGZvciB0aGUgaXJxL3NwaW5sb2NrIHNwbGl0LiAqLwo+ ICAJbG9jYWxfaXJxX3NhdmUoZmxhZ3MpOwo+ICAKPiAtCXJlc2V0X2lycShlbmdpbmUpOwo+IC0K PiAgCS8qCj4gIAkgKiBDYXRjaCB1cCB3aXRoIGFueSBtaXNzZWQgY29udGV4dC1zd2l0Y2ggaW50 ZXJydXB0cy4KPiAgCSAqCj4gQEAgLTE3MTEsMTUgKzE3MTIsMTMgQEAgc3RhdGljIHZvaWQgcmVz ZXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAo+ICAJICogcmVx dWVzdHMgd2VyZSBjb21wbGV0ZWQuCj4gIAkgKi8KPiAgCWV4ZWNsaXN0c19jYW5jZWxfcG9ydF9y ZXF1ZXN0cyhleGVjbGlzdHMpOwo+ICsJcmVzZXRfaXJxKGVuZ2luZSk7Cj4gIAo+ICAJLyogUHVz aCBiYWNrIGFueSBpbmNvbXBsZXRlIHJlcXVlc3RzIGZvciByZXBsYXkgYWZ0ZXIgdGhlIHJlc2V0 LiAqLwo+ICAJc3Bpbl9sb2NrKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsKPiAgCV9fdW53aW5k X2luY29tcGxldGVfcmVxdWVzdHMoZW5naW5lKTsKPiAgCXNwaW5fdW5sb2NrKCZlbmdpbmUtPnRp bWVsaW5lLT5sb2NrKTsKPiAgCj4gLQkvKiBNYXJrIGFsbCBDUyBpbnRlcnJ1cHRzIGFzIGNvbXBs ZXRlICovCj4gLQlleGVjbGlzdHMtPmFjdGl2ZSA9IDA7Cj4gLQo+ICAJbG9jYWxfaXJxX3Jlc3Rv cmUoZmxhZ3MpOwo+ICAKPiAgCS8qCj4gLS0gCj4gMi4xNi4yCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=