From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH] drm/i915: Break modeset deadlocks on reset Date: Wed, 21 Jun 2017 12:30:15 +0100 Message-ID: References: <20170620161218.9015-1-chris@chris-wilson.co.uk> <20170620195552.19584-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0623789BB0 for ; Wed, 21 Jun 2017 11:30:17 +0000 (UTC) In-Reply-To: <20170620195552.19584-1-chris@chris-wilson.co.uk> Content-Language: en-GB 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: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org Ck9uIDIwLzA2LzIwMTcgMjA6NTUsIENocmlzIFdpbHNvbiB3cm90ZToKPiBUcnlpbmcgdG8gZG8g YSBtb2Rlc2V0IGZyb20gd2l0aGluIGEgcmVzZXQgaXMgZnJhdWdodCB3aXRoIGRhbmdlci4gV2UK PiBjYW4gZmFsbCBpbnRvIGEgY3ljbGljIGRlYWRsb2NrIHdoZXJlIHRoZSBtb2Rlc2V0IGlzIHdh aXRpbmcgb24gYQo+IHByZXZpb3VzIG1vZGVzZXQgdGhhdCBpcyB3YWl0aW5nIG9uIGEgcmVxdWVz dCwgYW5kIHNpbmNlIHRoZSBHUFUgaHVuZwo+IHRoYXQgcmVxdWVzdCBjb21wbGV0aW9uIGlzIHdh aXRpbmcgb24gdGhlIHJlc2V0LiBBcyBtb2Rlc2V0dGluZyBkb2Vzbid0Cj4gYWxsb3cgaXRzIGxv Y2tzIHRvIGJlIGJyb2tlbiBhbmQgcmVzdGFydGVkLCBvciBmb3IgaXRzICpvd24qIHJlc2V0Cj4g bWVjaGFuaXNtIHRvIHRha2Ugb3ZlciB0aGUgZGlzcGxheSwgd2UgaGF2ZSB0byBkbyBzb21ldGhp bmcgdmVyeQo+IGV2aWwgaW5zdGVhZC4gSWYgd2UgZGV0ZWN0IHRoYXQgd2UgYXJlIHN0dWNrIHdh aXRpbmcgdG8gcHJlcGFyZSB0aGUKPiBkaXNwbGF5IHJlc2V0IChieSB1c2luZyBhIHZlcnkgc2lt cGxlIHRpbWVvdXQpLCByZXNvcnQgdG8gY2FuY2VsbGluZyBhbGwKPiBpbi1mbGlnaHQgcmVxdWVz dHMgYW5kIHRocm93aW5nIHRoZSB1c2VyIGRhdGEgaW50byAvZGV2L251bGwsIHdoaWNoIGlzCj4g bWFyZ2luYWxseSBiZXR0ZXIgdGhhbiB0aGUgZHJpdmVyIGxvY2tpbmcgdXAgYW5kIGtlZXBpbmcg dGhhdCBkYXRhIHRvCj4gaXRzZWxmLgo+IAo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IENjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1 b3BwYWxhQGludGVsLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgfCAxOCArKysrLS0tLS0tLS0tLS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf aXJxLmMgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQo+ICAg MiBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKPiAKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBpbmRleCBjMjIxMzAxNmZkODYuLjk3M2Y0ZjllNmI4NCAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IEBAIC0zMDQwLDcgKzMwNDAsOCBAQCBzdGF0 aWMgdm9pZCBlbmdpbmVfc2V0X3dlZGdlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cj4gICAJLyogTWFyayBhbGwgZXhlY3V0aW5nIHJlcXVlc3RzIGFzIHNraXBwZWQgKi8KPiAgIAlz cGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwo+ICAgCWxp c3RfZm9yX2VhY2hfZW50cnkocmVxdWVzdCwgJmVuZ2luZS0+dGltZWxpbmUtPnJlcXVlc3RzLCBs aW5rKQo+IC0JCWRtYV9mZW5jZV9zZXRfZXJyb3IoJnJlcXVlc3QtPmZlbmNlLCAtRUlPKTsKPiAr CQlpZiAoIWk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcXVlc3QpKQo+ICsJCQlkbWFfZmVu Y2Vfc2V0X2Vycm9yKCZyZXF1ZXN0LT5mZW5jZSwgLUVJTyk7Cj4gICAJc3Bpbl91bmxvY2tfaXJx cmVzdG9yZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwo+ICAgCj4gICAJLyogTWFy ayBhbGwgcGVuZGluZyByZXF1ZXN0cyBhcyBjb21wbGV0ZSBzbyB0aGF0IGFueSBjb25jdXJyZW50 Cj4gQEAgLTMwNzksNiArMzA4MCw3IEBAIHN0YXRpYyBpbnQgX19pOTE1X2dlbV9zZXRfd2VkZ2Vk X0JLTCh2b2lkICpkYXRhKQo+ICAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiAg IAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKPiAgIAo+ICsJc2V0X2JpdChJOTE1X1dFREdFRCwg Jmk5MTUtPmdwdV9lcnJvci5mbGFncyk7Cj4gICAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgaTkx NSwgaWQpCj4gICAJCWVuZ2luZV9zZXRfd2VkZ2VkKGVuZ2luZSk7Cj4gICAKPiBAQCAtMzA4Nywy MCArMzA4OSw3IEBAIHN0YXRpYyBpbnQgX19pOTE1X2dlbV9zZXRfd2VkZ2VkX0JLTCh2b2lkICpk YXRhKQo+ICAgCj4gICB2b2lkIGk5MTVfZ2VtX3NldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQo+ICAgewo+IC0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYt PmRybS5zdHJ1Y3RfbXV0ZXgpOwo+IC0Jc2V0X2JpdChJOTE1X1dFREdFRCwgJmRldl9wcml2LT5n cHVfZXJyb3IuZmxhZ3MpOwo+IC0KPiAtCS8qIFJldGlyZSBjb21wbGV0ZWQgcmVxdWVzdHMgZmly c3Qgc28gdGhlIGxpc3Qgb2YgaW5mbGlnaHQvaW5jb21wbGV0ZQo+IC0JICogcmVxdWVzdHMgaXMg YWNjdXJhdGUgYW5kIHdlIGRvbid0IHRyeSBhbmQgbWFyayBzdWNjZXNzZnVsIHJlcXVlc3RzCj4g LQkgKiBhcyBpbiBlcnJvciBkdXJpbmcgX19pOTE1X2dlbV9zZXRfd2VkZ2VkX0JLTCgpLgo+IC0J ICovCj4gLQlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMoZGV2X3ByaXYpOwo+IC0KPiAgIAlzdG9w X21hY2hpbmUoX19pOTE1X2dlbV9zZXRfd2VkZ2VkX0JLTCwgZGV2X3ByaXYsIE5VTEwpOwo+IC0K PiAtCWk5MTVfZ2VtX2NvbnRleHRzX2xvc3QoZGV2X3ByaXYpOwo+IC0KPiAtCW1vZF9kZWxheWVk X3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPmd0LmlkbGVfd29yaywgMCk7CgpXaGF0IHdh cyB0aGUgcHVycG9zZSBvZiB0aGlzLCBzaW5jZSBpdCBpcyBub3cgZ29uZT8KCj4gICB9Cj4gICAK PiAgIGJvb2wgaTkxNV9nZW1fdW5zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1KQo+IEBAIC0zMTU1LDYgKzMxNDQsNyBAQCBib29sIGk5MTVfZ2VtX3Vuc2V0X3dlZGdlZChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiAgIAkgKiBjb250ZXh0IGFuZCBkbyBub3Qg cmVxdWlyZSBzdG9wX21hY2hpbmUoKS4KPiAgIAkgKi8KPiAgIAlpbnRlbF9lbmdpbmVzX3Jlc2V0 X2RlZmF1bHRfc3VibWlzc2lvbihpOTE1KTsKPiArCWk5MTVfZ2VtX2NvbnRleHRzX2xvc3QoaTkx NSk7Cj4gICAKPiAgIAlzbXBfbWJfX2JlZm9yZV9hdG9taWMoKTsgLyogY29tcGxldGUgdGFrZW92 ZXIgYmVmb3JlIGVuYWJsaW5nIGV4ZWNidWYgKi8KPiAgIAljbGVhcl9iaXQoSTkxNV9XRURHRUQs ICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+IGluZGV4 IGJjZTJkMWZlY2ViMS4uNjU4NWJjZGY2MWE2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j Cj4gQEAgLTI1OTksNiArMjU5OSw0MCBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZ2VuOF9pcnFfaGFu ZGxlcihpbnQgaXJxLCB2b2lkICphcmcpCj4gICAJcmV0dXJuIHJldDsKPiAgIH0KPiAgIAo+ICtz dHJ1Y3Qgd2VkZ2VfbWUgewo+ICsJc3RydWN0IGRlbGF5ZWRfd29yayB3b3JrOwo+ICsJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTU7Cj4gKwljb25zdCBjaGFyICpuYW1lOwo+ICt9Owo+ICsK PiArc3RhdGljIHZvaWQgd2VkZ2VfbWUoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICt7Cj4g KwlzdHJ1Y3Qgd2VkZ2VfbWUgKncgPSBjb250YWluZXJfb2Yod29yaywgdHlwZW9mKCp3KSwgd29y ay53b3JrKTsKPiArCj4gKwlEUk1fRVJST1IoIiVzIHRpbWVkIG91dCwgY2FuY2VsbGluZyBhbGwg aW4tZmxpZ2h0IHJlbmRlcmluZy5cbiIsCj4gKwkJICB3LT5uYW1lKTsKCkRvIHlvdSBwbGFuIHRv IGNhbGwgdGhpcyBmcm9tIG90aGVyIHBsYWNlcyB0byBuZWVkIHRoZSBuYW1lIHN0cmluZz8KCj4g KwlpOTE1X2dlbV9zZXRfd2VkZ2VkKHctPmk5MTUpOwoKSXMgaXQgc2FmZSB0byBkbyB0aGUgZXhl Y2xpc3RfcG9ydCBtYW5pcHVsYXRpb24gYXQgdGhpcyBwb2ludD8gQ291bGRuJ3QgCndlIHJlY2Vp dmUgYW4gaW50ZXJydXB0IGZvciBvbmUgcmVxdWVzdCBjb21wbGV0aW5nIGFmdGVyIHdlIGhhdmUg Y2xlYXJlZCAKaXQgZnJvbSBwb3J0cyBidXQgYmVmb3JlIHRoZSBhY3R1YWwgcmVzZXQ/Cgo+ICt9 Cj4gKwo+ICtzdGF0aWMgYm9vbCBpbml0X3dlZGdlX29uX3RpbWVvdXQoc3RydWN0IHdlZGdlX21l ICp3LAo+ICsJCQkJICBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKPiArCQkJCSAgbG9u ZyB0aW1lb3V0LAo+ICsJCQkJICBjb25zdCBjaGFyICpuYW1lKQo+ICt7Cj4gKwl3LT5pOTE1ID0g aTkxNTsKPiArCXctPm5hbWUgPSBuYW1lOwo+ICsJSU5JVF9ERUxBWUVEX1dPUktfT05TVEFDSygm dy0+d29yaywgd2VkZ2VfbWUpOwo+ICsKPiArCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygmdy0+d29y aywgSFopOwoKT25lIHNlY29uZCBpcyBwZXNzaW1pc3RpYyBlbm91Z2ggZXRjPwoKPiArCXJldHVy biB0cnVlOwoKSXMgdGhlIHJldHVybiB2YWx1ZSBuZWVkZWQ/Cgo+ICt9Cj4gKwo+ICtzdGF0aWMg dm9pZCBkZXN0cm95X3dlZGdlX29uX3RpbWVvdXQoc3RydWN0IHdlZGdlX21lICp3KQo+ICt7Cj4g KwljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJnctPndvcmspOwo+ICsJZGVzdHJveV9kZWxheWVk X3dvcmtfb25fc3RhY2soJnctPndvcmspOwo+ICt9Cj4gKwoKU2xpZ2h0IG9iamVjdGlvbiB0byB0 aGUgIm9uIHN0YWNrIiBBUEkgc2luY2UgaXQgaXMgZGlzY29ubmVjdGVkIGZyb20gdGhlIAphbGxv Y2F0aW9uIHNvIGRvZXMgbm90IGRpcmVjdGx5IHNlZSB3aGV0aGVyIGl0IGlzIHJlYWxseSBvbiBz dGFjay4gQnV0IAppdCBpcyBjbG9zZSBlbm91Z2ggdG8gaXQgYW5kIHdpdGgganVzdCBvbmUgdXNl ciBzbyBjb3VsZCBiZSBwYXNzYWJsZS4KCj4gICAvKioKPiAgICAqIGk5MTVfcmVzZXRfYW5kX3dh a2V1cCAtIGRvIHByb2Nlc3MgY29udGV4dCBlcnJvciBoYW5kbGluZyB3b3JrCj4gICAgKiBAZGV2 X3ByaXY6IGk5MTUgZGV2aWNlIHByaXZhdGUKPiBAQCAtMjYxMiwxMyArMjY0NiwxNyBAQCBzdGF0 aWMgdm9pZCBpOTE1X3Jlc2V0X2FuZF93YWtldXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQoKV2lsbCBuZWVkIHJlYmFzZS4KCj4gICAJY2hhciAqZXJyb3JfZXZlbnRbXSA9IHsg STkxNV9FUlJPUl9VRVZFTlQgIj0xIiwgTlVMTCB9Owo+ICAgCWNoYXIgKnJlc2V0X2V2ZW50W10g PSB7IEk5MTVfUkVTRVRfVUVWRU5UICI9MSIsIE5VTEwgfTsKPiAgIAljaGFyICpyZXNldF9kb25l X2V2ZW50W10gPSB7IEk5MTVfRVJST1JfVUVWRU5UICI9MCIsIE5VTEwgfTsKPiArCXN0cnVjdCB3 ZWRnZV9tZSB3Owo+ICAgCj4gICAJa29iamVjdF91ZXZlbnRfZW52KGtvYmosIEtPQkpfQ0hBTkdF LCBlcnJvcl9ldmVudCk7Cj4gICAKPiAgIAlEUk1fREVCVUdfRFJJVkVSKCJyZXNldHRpbmcgY2hp cFxuIik7Cj4gICAJa29iamVjdF91ZXZlbnRfZW52KGtvYmosIEtPQkpfQ0hBTkdFLCByZXNldF9l dmVudCk7Cj4gICAKPiAtCWludGVsX3ByZXBhcmVfcmVzZXQoZGV2X3ByaXYpOwo+ICsJaWYgKGlu aXRfd2VkZ2Vfb25fdGltZW91dCgmdywgZGV2X3ByaXYsIEhaLCAiaW50ZWxfcHJlcGFyZV9yZXNl dCIpKSB7Cj4gKwkJaW50ZWxfcHJlcGFyZV9yZXNldChkZXZfcHJpdik7Cj4gKwkJZGVzdHJveV93 ZWRnZV9vbl90aW1lb3V0KCZ3KTsKPiArCX0KPiAgIAo+ICAgCXNldF9iaXQoSTkxNV9SRVNFVF9I QU5ET0ZGLCAmZGV2X3ByaXYtPmdwdV9lcnJvci5mbGFncyk7Cj4gICAJd2FrZV91cF9hbGwoJmRl dl9wcml2LT5ncHVfZXJyb3Iud2FpdF9xdWV1ZSk7Cj4gQEAgLTI2NDIsNiArMjY4MCw3IEBAIHN0 YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gICAJCQkJICAgICBIWikpOwo+ICAgCj4gICAJaW50ZWxfZmluaXNoX3Jlc2V0 KGRldl9wcml2KTsKPiArCW1vZF9kZWxheWVkX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYt Pmd0LnJldGlyZV93b3JrLCAwKTsKCkEgY29tbWVudCBleHBsYWluaW5nIHdoeSB0aGlzPwoKPiAg IAo+ICAgCWlmICghdGVzdF9iaXQoSTkxNV9XRURHRUQsICZkZXZfcHJpdi0+Z3B1X2Vycm9yLmZs YWdzKSkKPiAgIAkJa29iamVjdF91ZXZlbnRfZW52KGtvYmosCj4gCgpSZWdhcmRzLAoKVHZydGtv Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=