From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH v2] drm/i915: Break modeset deadlocks on reset Date: Wed, 21 Jun 2017 17:55:06 +0200 Message-ID: <007b81f4-a2fa-a977-55b7-b2db9d3a0154@linux.intel.com> References: <20170620161218.9015-1-chris@chris-wilson.co.uk> <20170621142413.29323-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D28016E459 for ; Wed, 21 Jun 2017 15:55:13 +0000 (UTC) In-Reply-To: <20170621142413.29323-1-chris@chris-wilson.co.uk> Content-Language: en-US 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 T3AgMjEtMDYtMTcgb20gMTY6MjQgc2NocmVlZiBDaHJpcyBXaWxzb246Cj4gVHJ5aW5nIHRvIGRv IGEgbW9kZXNldCBmcm9tIHdpdGhpbiBhIHJlc2V0IGlzIGZyYXVnaHQgd2l0aCBkYW5nZXIuIFdl Cj4gY2FuIGZhbGwgaW50byBhIGN5Y2xpYyBkZWFkbG9jayB3aGVyZSB0aGUgbW9kZXNldCBpcyB3 YWl0aW5nIG9uIGEKPiBwcmV2aW91cyBtb2Rlc2V0IHRoYXQgaXMgd2FpdGluZyBvbiBhIHJlcXVl c3QsIGFuZCBzaW5jZSB0aGUgR1BVIGh1bmcKPiB0aGF0IHJlcXVlc3QgY29tcGxldGlvbiBpcyB3 YWl0aW5nIG9uIHRoZSByZXNldC4gQXMgbW9kZXNldHRpbmcgZG9lc24ndAo+IGFsbG93IGl0cyBs b2NrcyB0byBiZSBicm9rZW4gYW5kIHJlc3RhcnRlZCwgb3IgZm9yIGl0cyAqb3duKiByZXNldAo+ IG1lY2hhbmlzbSB0byB0YWtlIG92ZXIgdGhlIGRpc3BsYXksIHdlIGhhdmUgdG8gZG8gc29tZXRo aW5nIHZlcnkKPiBldmlsIGluc3RlYWQuIElmIHdlIGRldGVjdCB0aGF0IHdlIGFyZSBzdHVjayB3 YWl0aW5nIHRvIHByZXBhcmUgdGhlCj4gZGlzcGxheSByZXNldCAoYnkgdXNpbmcgYSB2ZXJ5IHNp bXBsZSB0aW1lb3V0KSwgcmVzb3J0IHRvIGNhbmNlbGxpbmcgYWxsCj4gaW4tZmxpZ2h0IHJlcXVl c3RzIGFuZCB0aHJvd2luZyB0aGUgdXNlciBkYXRhIGludG8gL2Rldi9udWxsLCB3aGljaCBpcwo+ IG1hcmdpbmFsbHkgYmV0dGVyIHRoYW4gdGhlIGRyaXZlciBsb2NraW5nIHVwIGFuZCBrZWVwaW5n IHRoYXQgZGF0YSB0bwo+IGl0c2VsZi4KPgo+IFRoaXMgaXMgbm90IGEgZml4OyB0aGlzIGlzIGp1 c3QgYSB3b3JrYXJvdW5kIHRoYXQgdW5icmVha3MgbWFjaGluZXMKPiB1bnRpbCB3ZSBjYW4gcmVz b2x2ZSB0aGUgZGVhZGxvY2sgaW4gYSB3YXkgdGhhdCBkb2Vzbid0IGxvc2UgZGF0YSEKPgo+IHYy OiBNb3ZlIHRoZSByZXRpcmVtZW50IGZyb20gc2V0LXdlZ2RlZCB0byB0aGUgaTkxNV9yZXNldCgp IGVycm9yIHBhdGgsCj4gYWZ0ZXIgd2hpY2ggd2Ugbm8gbG9uZ2VyIGFueSBkZWxheWVkIHdvcmtl ciBjbGVhbnVwIGZvcgo+IGk5MTVfaGFuZGxlX2Vycm9yKCkKPiB2MzogQyBhYnVzZSBmb3Igc3lu dGFjdGljIHN1Z2FyCj4KPiBSZWZlcmVuY2VzOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3Jn L3Nob3dfYnVnLmNnaT9pZD05OTA5Mwo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IENjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3Bw YWxhQGludGVsLmNvbT4KPiBDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVs LmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8ICAxICsKPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDE4ICsrKystLS0tLS0tLS0tLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCA0NSArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMo KyksIDE1IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gaW5kZXggZDFh YTEwYzljYzVkLi4xZGY5NTdiOTg2YzcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiBA QCAtMTkxNCw2ICsxOTE0LDcgQEAgdm9pZCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKPiAgCj4gIGVycm9yOgo+ICAJaTkxNV9nZW1fc2V0X3dlZGdlZChkZXZf cHJpdik7Cj4gKwlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMoZGV2X3ByaXYpOwo+ICAJZ290byBm aW5pc2g7Cj4gIH0KPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggYWUzY2UxMzE0 YmQxLi4zNmQ4Mzg2Nzc5ODIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBAQCAtMzA2 Miw3ICszMDYyLDggQEAgc3RhdGljIHZvaWQgZW5naW5lX3NldF93ZWRnZWQoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQo+ICAJLyogTWFyayBhbGwgZXhlY3V0aW5nIHJlcXVlc3RzIGFz IHNraXBwZWQgKi8KPiAgCXNwaW5fbG9ja19pcnFzYXZlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2Nr LCBmbGFncyk7Cj4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVlc3QsICZlbmdpbmUtPnRpbWVs aW5lLT5yZXF1ZXN0cywgbGluaykKPiAtCQlkbWFfZmVuY2Vfc2V0X2Vycm9yKCZyZXF1ZXN0LT5m ZW5jZSwgLUVJTyk7Cj4gKwkJaWYgKCFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXF1ZXN0 KSkKPiArCQkJZG1hX2ZlbmNlX3NldF9lcnJvcigmcmVxdWVzdC0+ZmVuY2UsIC1FSU8pOwo+ICAJ c3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwo+ ICAKPiAgCS8qIE1hcmsgYWxsIHBlbmRpbmcgcmVxdWVzdHMgYXMgY29tcGxldGUgc28gdGhhdCBh bnkgY29uY3VycmVudAo+IEBAIC0zMTA4LDYgKzMxMDksNyBAQCBzdGF0aWMgaW50IF9faTkxNV9n ZW1fc2V0X3dlZGdlZF9CS0wodm9pZCAqZGF0YSkKPiAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZTsKPiAgCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwo+ICAKPiArCXNldF9iaXQoSTkx NV9XRURHRUQsICZpOTE1LT5ncHVfZXJyb3IuZmxhZ3MpOwo+ICAJZm9yX2VhY2hfZW5naW5lKGVu Z2luZSwgaTkxNSwgaWQpCj4gIAkJZW5naW5lX3NldF93ZWRnZWQoZW5naW5lKTsKPiAgCj4gQEAg LTMxMTYsMjAgKzMxMTgsNyBAQCBzdGF0aWMgaW50IF9faTkxNV9nZW1fc2V0X3dlZGdlZF9CS0wo dm9pZCAqZGF0YSkKPiAgCj4gIHZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gIHsKPiAtCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9w cml2LT5kcm0uc3RydWN0X211dGV4KTsKPiAtCXNldF9iaXQoSTkxNV9XRURHRUQsICZkZXZfcHJp di0+Z3B1X2Vycm9yLmZsYWdzKTsKPiAtCj4gLQkvKiBSZXRpcmUgY29tcGxldGVkIHJlcXVlc3Rz IGZpcnN0IHNvIHRoZSBsaXN0IG9mIGluZmxpZ2h0L2luY29tcGxldGUKPiAtCSAqIHJlcXVlc3Rz IGlzIGFjY3VyYXRlIGFuZCB3ZSBkb24ndCB0cnkgYW5kIG1hcmsgc3VjY2Vzc2Z1bCByZXF1ZXN0 cwo+IC0JICogYXMgaW4gZXJyb3IgZHVyaW5nIF9faTkxNV9nZW1fc2V0X3dlZGdlZF9CS0woKS4K PiAtCSAqLwo+IC0JaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKGRldl9wcml2KTsKPiAtCj4gIAlz dG9wX21hY2hpbmUoX19pOTE1X2dlbV9zZXRfd2VkZ2VkX0JLTCwgZGV2X3ByaXYsIE5VTEwpOwo+ IC0KPiAtCWk5MTVfZ2VtX2NvbnRleHRzX2xvc3QoZGV2X3ByaXYpOwo+IC0KPiAtCW1vZF9kZWxh eWVkX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPmd0LmlkbGVfd29yaywgMCk7Cj4gIH0K PiAgCj4gIGJvb2wgaTkxNV9nZW1fdW5zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1KQo+IEBAIC0zMTg0LDYgKzMxNzMsNyBAQCBib29sIGk5MTVfZ2VtX3Vuc2V0X3dlZGdl ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiAgCSAqIGNvbnRleHQgYW5kIGRvIG5v dCByZXF1aXJlIHN0b3BfbWFjaGluZSgpLgo+ICAJICovCj4gIAlpbnRlbF9lbmdpbmVzX3Jlc2V0 X2RlZmF1bHRfc3VibWlzc2lvbihpOTE1KTsKPiArCWk5MTVfZ2VtX2NvbnRleHRzX2xvc3QoaTkx NSk7Cj4gIAo+ICAJc21wX21iX19iZWZvcmVfYXRvbWljKCk7IC8qIGNvbXBsZXRlIHRha2VvdmVy IGJlZm9yZSBlbmFibGluZyBleGVjYnVmICovCj4gIAljbGVhcl9iaXQoSTkxNV9XRURHRUQsICZp OTE1LT5ncHVfZXJyb3IuZmxhZ3MpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+IGluZGV4IGIx YzdkMWEwNDYxMi4uYzk0OGE1YmQwMzFjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCj4g QEAgLTI1OTksNiArMjU5OSw0NiBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZ2VuOF9pcnFfaGFuZGxl cihpbnQgaXJxLCB2b2lkICphcmcpCj4gIAlyZXR1cm4gcmV0Owo+ICB9Cj4gIAo+ICtzdHJ1Y3Qg d2VkZ2VfbWUgewo+ICsJc3RydWN0IGRlbGF5ZWRfd29yayB3b3JrOwo+ICsJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTU7Cj4gKwljb25zdCBjaGFyICpuYW1lOwo+ICt9Owo+ICsKPiArc3Rh dGljIHZvaWQgd2VkZ2VfbWUoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICt7Cj4gKwlzdHJ1 Y3Qgd2VkZ2VfbWUgKncgPSBjb250YWluZXJfb2Yod29yaywgdHlwZW9mKCp3KSwgd29yay53b3Jr KTsKPiArCj4gKwlkZXZfZXJyKHctPmk5MTUtPmRybS5kZXYsCj4gKwkJIiVzIHRpbWVkIG91dCwg Y2FuY2VsbGluZyBhbGwgaW4tZmxpZ2h0IHJlbmRlcmluZy5cbiIsCj4gKwkJdy0+bmFtZSk7Cj4g KwlpOTE1X2dlbV9zZXRfd2VkZ2VkKHctPmk5MTUpOwo+ICt9Cj4gKwo+ICtzdGF0aWMgdm9pZCBf X2luaXRfd2VkZ2Uoc3RydWN0IHdlZGdlX21lICp3LAo+ICsJCQkgc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUsCj4gKwkJCSBsb25nIHRpbWVvdXQsCj4gKwkJCSBjb25zdCBjaGFyICpuYW1l KQo+ICt7Cj4gKwl3LT5pOTE1ID0gaTkxNTsKPiArCXctPm5hbWUgPSBuYW1lOwo+ICsKPiArCUlO SVRfREVMQVlFRF9XT1JLX09OU1RBQ0soJnctPndvcmssIHdlZGdlX21lKTsKPiArCXNjaGVkdWxl X2RlbGF5ZWRfd29yaygmdy0+d29yaywgdGltZW91dCk7Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lk IF9fZmluaV93ZWRnZShzdHJ1Y3Qgd2VkZ2VfbWUgKncpCj4gK3sKPiArCWNhbmNlbF9kZWxheWVk X3dvcmtfc3luYygmdy0+d29yayk7Cj4gKwlkZXN0cm95X2RlbGF5ZWRfd29ya19vbl9zdGFjaygm dy0+d29yayk7Cj4gKwl3LT5pOTE1ID0gTlVMTDsKPiArfQo+ICsKPiArI2RlZmluZSBpOTE1X3dl ZGdlX29uX3RpbWVvdXQoVywgREVWLCBUSU1FT1VULCBNU0cpCQkJXAo+ICsJZm9yIChfX2luaXRf d2VkZ2UoKFcpLCAoREVWKSwgKFRJTUVPVVQpLCAoTVNHKSk7CQlcCj4gKwkgICAgIChXKS0+aTkx NTsJCQkJCQkJXAo+ICsJICAgICBfX2Zpbmlfd2VkZ2UoKFcpKSkKPiArCj4gIC8qKgo+ICAgKiBp OTE1X3Jlc2V0X2RldmljZSAtIGRvIHByb2Nlc3MgY29udGV4dCBlcnJvciBoYW5kbGluZyB3b3Jr Cj4gICAqIEBkZXZfcHJpdjogaTkxNSBkZXZpY2UgcHJpdmF0ZQo+IEBAIC0yNjEyLDEzICsyNjUy LDE2IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfZGV2aWNlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKPiAgCWNoYXIgKmVycm9yX2V2ZW50W10gPSB7IEk5MTVfRVJST1JfVUVW RU5UICI9MSIsIE5VTEwgfTsKPiAgCWNoYXIgKnJlc2V0X2V2ZW50W10gPSB7IEk5MTVfUkVTRVRf VUVWRU5UICI9MSIsIE5VTEwgfTsKPiAgCWNoYXIgKnJlc2V0X2RvbmVfZXZlbnRbXSA9IHsgSTkx NV9FUlJPUl9VRVZFTlQgIj0wIiwgTlVMTCB9Owo+ICsJc3RydWN0IHdlZGdlX21lIHc7Cj4gIAo+ ICAJa29iamVjdF91ZXZlbnRfZW52KGtvYmosIEtPQkpfQ0hBTkdFLCBlcnJvcl9ldmVudCk7Cj4g IAo+ICAJRFJNX0RFQlVHX0RSSVZFUigicmVzZXR0aW5nIGNoaXBcbiIpOwo+ICAJa29iamVjdF91 ZXZlbnRfZW52KGtvYmosIEtPQkpfQ0hBTkdFLCByZXNldF9ldmVudCk7Cj4gIAo+IC0JaW50ZWxf cHJlcGFyZV9yZXNldChkZXZfcHJpdik7Cj4gKwlpOTE1X3dlZGdlX29uX3RpbWVvdXQoJncsIGRl dl9wcml2LCBIWiwgImludGVsX3ByZXBhcmVfcmVzZXQiKSB7Cj4gKwkJaW50ZWxfcHJlcGFyZV9y ZXNldChkZXZfcHJpdik7Cj4gKwl9CkkgdGhpbmsgdjIgd2FzIG1vcmUgY2xlYXIgaGVyZS4KCkJ1 dCBpZiB0aGlzIGlzIGp1c3QgZm9yIHRoZSBtb2Rlc2V0IGxvY2tzLCB3aHkgbm90IGFkZCBhIHRp bWVvdXQgdG8gaTkxNV9zd19mZW5jZV9hd2FpdF9yZXNlcnZhdGlvbiBvbiBvbGRfb2JqPwoKVGhh dCB3b3VsZCBhbGxvdyB1cyB0byBlbmQgdGhlIGRlYWRsb2NrcyB3aXRob3V0IGhhdmluZyB0byBr aWxsIG9mZiBhbGwgZmVuY2VzIGZpcnN0LgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK