From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH v3 2/2] drm/i915: Restore engine->submit_request before unwedging Date: Wed, 15 Mar 2017 10:04:13 +0000 Message-ID: <482f5c2f-ae2c-ba37-63be-fe9ffb0823c1@linux.intel.com> References: <20170314093441.7397-1-chris@chris-wilson.co.uk> <20170314093441.7397-2-chris@chris-wilson.co.uk> <20170315093421.GQ2118@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 45F866E84B for ; Wed, 15 Mar 2017 10:04:16 +0000 (UTC) In-Reply-To: <20170315093421.GQ2118@nuc-i3427.alporthouse.com> 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, Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org Ck9uIDE1LzAzLzIwMTcgMDk6MzQsIENocmlzIFdpbHNvbiB3cm90ZToKPiBPbiBXZWQsIE1hciAx NSwgMjAxNyBhdCAwOToyMzowMUFNICswMDAwLCBUdnJ0a28gVXJzdWxpbiB3cm90ZToKPj4KPj4g T24gMTQvMDMvMjAxNyAwOTozNCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+Pj4gV2hlbiB3ZSB3ZWRn ZSB0aGUgZGV2aWNlLCB3ZSBvdmVycmlkZSBlbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0IHdpdGggYSBu b3AKPj4+IHRvIGVuc3VyZSB0aGF0IGFsbCBpbi1mbGlnaHQgcmVxdWVzdHMgYXJlIG1hcmtlZCBp biBlcnJvci4gSG93ZXZlciwgaWd0Cj4+PiB3b3VsZCBsaWtlIHRvIHVud2VkZ2UgdGhlIGRldmlj ZSB0byB0ZXN0IC1FSU8gaGFuZGxpbmcuIFRoaXMgcmVxdWlyZXMgdXMKPj4+IHRvIGZsdXNoIHRo b3NlIGluLWZsaWdodCByZXF1ZXN0cyBhbmQgcmVzdG9yZSB0aGUgb3JpZ2luYWwKPj4+IGVuZ2lu ZS0+c3VibWl0X3JlcXVlc3QuCj4+Pgo+Pj4gdjI6IFVzZSBhIHZmdW5jIHRvIHVuaWZ5IGVuYWJs aW5nIHJlcXVlc3Qgc3VibWlzc2lvbiB0byBlbmdpbmVzCj4+PiB2MzogU3BsaXQgbmV3IHZmdW5j IHRvIGEgc2VwYXJhdGUgcGF0Y2guCj4+Pgo+Pj4gRml4ZXM6IDgyMWVkN2RmNmUyYSAoImRybS9p OTE1OiBVcGRhdGUgcmVzZXQgcGF0aCB0byBmaXggaW5jb21wbGV0ZSByZXF1ZXN0cyIpCj4+PiBU ZXN0Y2FzZTogaWd0L2dlbV9laW8KPj4+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+Pj4gQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+Cj4+PiBDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRl bC5jb20+Cj4+PiAtLS0KPj4+IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAgMiAr LQo+Pj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAxICsKPj4+IGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwo+Pj4gMyBmaWxlcyBjaGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCAxIGRl bGV0aW9uKC0pCj4+Pgo+Pj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4+PiBpbmRleCBlMzEyYjYx YmE2YmIuLjExZDEwNjZiNjczYyAxMDA2NDQKPj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPj4+ IEBAIC0xODIyLDcgKzE4MjIsNyBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQo+Pj4gCQlyZXR1cm47Cj4+Pgo+Pj4gCS8qIENsZWFyIGFueSBwcmV2 aW91cyBmYWlsZWQgYXR0ZW1wdHMgYXQgcmVjb3ZlcnkuIFRpbWUgdG8gdHJ5IGFnYWluLiAqLwo+ Pj4gLQlfX2NsZWFyX2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5mbGFncyk7Cj4+PiArCWk5MTVf Z2VtX3Vuc2V0X3dlZGdlZChkZXZfcHJpdik7Cj4+PiAJZXJyb3ItPnJlc2V0X2NvdW50Kys7Cj4+ Pgo+Pj4gCXByX25vdGljZSgiZHJtL2k5MTU6IFJlc2V0dGluZyBjaGlwIGFmdGVyIGdwdSBoYW5n XG4iKTsKPj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+Pj4gaW5kZXggNDhmZjY0ODEyMjg5Li41 M2E3OTFkOGQ5OTIgMTAwNjQ0Cj4+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCj4+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4+PiBAQCAtMzQw Niw2ICszNDA2LDcgQEAgaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKPj4+IHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPj4+IHZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cj4+PiB2b2lkIGk5MTVfZ2VtX3NldF93 ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPj4+ICt2b2lkIGk5MTVf Z2VtX3Vuc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwo+Pj4K Pj4+IHZvaWQgaTkxNV9nZW1faW5pdF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 KTsKPj4+IGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpOwo+Pj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4+PiBpbmRleCAyMDJi Yjg1MGYyNjAuLmUwNjgzMDkxNmEwNSAxMDA2NDQKPj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKPj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK Pj4+IEBAIC0zMDAwLDYgKzMwMDAsNTcgQEAgdm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPj4+IAltb2RfZGVsYXllZF93b3JrKGRldl9w cml2LT53cSwgJmRldl9wcml2LT5ndC5pZGxlX3dvcmssIDApOwo+Pj4gfQo+Pj4KPj4+ICt2b2lk IGk5MTVfZ2VtX3Vuc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPj4+ ICt7Cj4+PiArCXN0cnVjdCBpOTE1X2dlbV90aW1lbGluZSAqdGw7Cj4+PiArCWludCBpOwo+Pj4g Kwo+Pj4gKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKPj4+ ICsJaWYgKCF0ZXN0X2JpdChJOTE1X1dFREdFRCwgJmk5MTUtPmdwdV9lcnJvci5mbGFncykpCj4+ PiArCQlyZXR1cm47Cj4+PiArCj4+PiArCS8qIEJlZm9yZSB1bndlZGdpbmcsIG1ha2Ugc3VyZSB0 aGF0IGFsbCBwZW5kaW5nIG9wZXJhdGlvbnMKPj4+ICsJICogYXJlIGZsdXNoZWQgYW5kIGVycm9y ZWQgb3V0LiBObyBtb3JlIGNhbiBiZSBzdWJtaXR0ZWQgdW50aWwKPj4+ICsJICogd2UgcmVzZXQg dGhlIHdlZGdlZCBiaXQuCj4+PiArCSAqLwo+Pj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHRsLCAm aTkxNS0+Z3QudGltZWxpbmVzLCBsaW5rKSB7Cj4+PiArCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlf U0laRSh0bC0+ZW5naW5lKTsgaSsrKSB7Cj4+PiArCQkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpycTsKPj4+ICsKPj4+ICsJCQlycSA9IGk5MTVfZ2VtX2FjdGl2ZV9wZWVrKCZ0bC0+ZW5n aW5lW2ldLmxhc3RfcmVxdWVzdCwKPj4+ICsJCQkJCQkgICZpOTE1LT5kcm0uc3RydWN0X211dGV4 KTsKPj4+ICsJCQlpZiAoIXJxKQo+Pj4gKwkJCQljb250aW51ZTsKPj4+ICsKPj4+ICsJCQkvKiBX ZSBjYW4ndCB1c2Ugb3VyIG5vcm1hbCB3YWl0ZXIgYXMgd2Ugd2FudCB0bwo+Pj4gKwkJCSAqIGF2 b2lkIHJlY3Vyc2l2ZWx5IHRyeWluZyB0byBoYW5kbGUgdGhlIGN1cnJlbnQKPj4+ICsJCQkgKiBy ZXNldC4gVGhlIGJhc2ljIGRtYV9mZW5jZV9kZWZhdWx0X3dhaXQoKSBpbnN0YWxscwo+Pj4gKwkJ CSAqIGEgY2FsbGJhY2sgZm9yIGRtYV9mZW5jZV9zaWduYWwoKSwgd2hpY2ggaXMKPj4+ICsJCQkg KiB0cmlnZ2VyZWQgYnkgb3VyIG5vcCBoYW5kbGVyIChpbmRpcmVjdGx5LCB0aGUKPj4+ICsJCQkg KiBjYWxsYmFjayBlbmFibGVzIHRoZSBzaWduYWxlciB0aHJlYWQgd2hpY2ggaXMKPj4+ICsJCQkg KiB3b2tlbiBieSB0aGUgbm9wX3N1Ym1pdF9yZXF1ZXN0KCkgYWR2YW5jaW5nIHRoZSBzZXFubwo+ Pj4gKwkJCSAqIGFuZCB3aGVuIHRoZSBzZXFubyBwYXNzZXMgdGhlIGZlbmNlLCB0aGUgc2lnbmFs ZXIKPj4+ICsJCQkgKiB0aGVuIHNpZ25hbHMgdGhlIGZlbmNlIHdha2luZyB1cyB1cCkuCj4+PiAr CQkJICovCj4+PiArCQkJZG1hX2ZlbmNlX2RlZmF1bHRfd2FpdCgmcnEtPmZlbmNlLCBmYWxzZSwK Pj4+ICsJCQkJCSAgICAgICBNQVhfU0NIRURVTEVfVElNRU9VVCk7Cj4+PiArCQl9Cj4+PiArCX0K Pj4+ICsKPj4+ICsJLyogVW5kbyBub3Bfc3VibWl0X3JlcXVlc3QuIFdlIHByZXZlbnQgYWxsIG5l dyBpOTE1IHJlcXVlc3RzIGZyb20KPj4+ICsJICogYmVpbmcgcXVldWVkIChieSBkaXNhbGxvd2lu ZyBleGVjYnVmIHdoaWxzdCB3ZWRnZWQpIHNvIGhhdmluZwo+Pj4gKwkgKiB3YWl0ZWQgZm9yIGFs bCBhY3RpdmUgcmVxdWVzdHMgYWJvdmUsIHdlIGtub3cgdGhlIHN5c3RlbSBpcyBpZGxlCj4+PiAr CSAqIGFuZCBkbyBub3QgaGF2ZSB0byB3b3JyeSBhYm91dCBhIHRocmVhZCBiZWluZyBpbnNpZGUK Pj4+ICsJICogZW5naW5lLT5zdWJtaXRfcmVxdWVzdCgpIGFzIHdlIHN3YXAgb3Zlci4gU28gdW5s aWtlIGluc3RhbGxpbmcKPj4+ICsJICogdGhlIG5vcF9zdWJtaXRfcmVxdWVzdCBvbiByZXNldCwg d2UgY2FuIGRvIHRoaXMgZnJvbSBub3JtYWwKPj4+ICsJICogY29udGV4dCBhbmQgZG8gbm90IHJl cXVpcmUgc3RvcF9tYWNoaW5lKCkuCj4+PiArCSAqLwo+Pj4gKwlpbnRlbF9lbmdpbmVzX2VuYWJs ZV9zdWJtaXNzaW9uKGk5MTUpOwo+Pgo+PiBTbyB0aGUgcG9pbnQgb2YgdGhlIGRtYV9mZW5jZV9k ZWZhdWx0X3dhaXQgYWJvdmUgaXMgaXQgdG8gZW5zdXJlIGFsbAo+PiBub3Bfc3VibWl0X3JlcXVl c3QgY2FsbCBiYWNrcyBoYXZlIGNvbXBsZXRlZD8gSSBkb24ndCBhdCB0aGUgbW9tZW50Cj4+IHVu ZGVyc3RhbmQgaG93IGNvdWxkIHRoZXJlIGJlIHN1Y2ggY2FsbGJhY2tzIHNpbmNlIHVud2VkZ2Ug aXMKPj4gaGFwcGVuaW5nIGFmdGVyIHRoZSB3ZWRnZS4gU28gdGhlIHdlZGdlIGFscmVhZHkgaW5z dGFsbGVkIHRoZSBub3AKPj4gaGFuZGxlciwgYW5kIGJ5IHRoZSB0aW1lIHdlIGdldCB0byBhbm90 aGVyIHJlc2V0IGF0dGVtcHQsIGlzbid0IGl0Cj4+IGFscmVhZHkgZ3VhcmFudGVlZCBhbGwgb2Yg dGhvc2UgaGF2ZSBleGl0ZWQ/Cj4KPiBUaGVyZSdzIG5vIHN1Y2ggZ3VhcmFudGVlLiBUaGUgbm9w X3N1Ym1pdF9yZXF1ZXN0KCkgaXMgdG8gZW5zdXJlIHRoYXQgYWxsCj4gdGhpcmQgcGFydHkgZHJp dmVuIHJlcXVlc3RzIGFyZSBmbHVzaGVkIGFuZCBvdXIgcmVxdWVzdHMgYXJlIG1hcmtlZCB3aXRo Cj4gZG1hX2ZlbmNlX3NldF9lcnJvcigtRUlPKSBhbmQgbm90IHN1Ym1pdHRlZCB0byBody4KCkkg d2FzIHRoaW5raW5nIHRoYXQgdGhlIGFib3ZlIGxvb3AgaXMgb25seSBhYm91dCB0aGUgcnVubmFi bGUgcmVxdWVzdHMgCmJ1dCBpdCdzIG5vdC4gT2theSwgSSB0aGluayBJIGdldCBpdCBub3cuCgpS ZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJl Z2FyZHMsCgpUdnJ0a28KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==