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 09:23:01 +0000 Message-ID: References: <20170314093441.7397-1-chris@chris-wilson.co.uk> <20170314093441.7397-2-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C3DC6E0A0 for ; Wed, 15 Mar 2017 09:23:04 +0000 (UTC) In-Reply-To: <20170314093441.7397-2-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 Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org Ck9uIDE0LzAzLzIwMTcgMDk6MzQsIENocmlzIFdpbHNvbiB3cm90ZToKPiBXaGVuIHdlIHdlZGdl IHRoZSBkZXZpY2UsIHdlIG92ZXJyaWRlIGVuZ2luZS0+c3VibWl0X3JlcXVlc3Qgd2l0aCBhIG5v cAo+IHRvIGVuc3VyZSB0aGF0IGFsbCBpbi1mbGlnaHQgcmVxdWVzdHMgYXJlIG1hcmtlZCBpbiBl cnJvci4gSG93ZXZlciwgaWd0Cj4gd291bGQgbGlrZSB0byB1bndlZGdlIHRoZSBkZXZpY2UgdG8g dGVzdCAtRUlPIGhhbmRsaW5nLiBUaGlzIHJlcXVpcmVzIHVzCj4gdG8gZmx1c2ggdGhvc2UgaW4t ZmxpZ2h0IHJlcXVlc3RzIGFuZCByZXN0b3JlIHRoZSBvcmlnaW5hbAo+IGVuZ2luZS0+c3VibWl0 X3JlcXVlc3QuCj4KPiB2MjogVXNlIGEgdmZ1bmMgdG8gdW5pZnkgZW5hYmxpbmcgcmVxdWVzdCBz dWJtaXNzaW9uIHRvIGVuZ2luZXMKPiB2MzogU3BsaXQgbmV3IHZmdW5jIHRvIGEgc2VwYXJhdGUg cGF0Y2guCj4KPiBGaXhlczogODIxZWQ3ZGY2ZTJhICgiZHJtL2k5MTU6IFVwZGF0ZSByZXNldCBw YXRoIHRvIGZpeCBpbmNvbXBsZXRlIHJlcXVlc3RzIikKPiBUZXN0Y2FzZTogaWd0L2dlbV9laW8K PiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K PiBDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KPiBDYzogTWlr YSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAgMiArLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIHwgIDEgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgNTEgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKPiAgMyBmaWxlcyBjaGFuZ2Vk LCA1MyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMKPiBpbmRleCBlMzEyYjYxYmE2YmIuLjExZDEwNjZiNjczYyAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwo+IEBAIC0xODIyLDcgKzE4MjIsNyBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICAJCXJldHVybjsKPgo+ICAJLyogQ2xlYXIg YW55IHByZXZpb3VzIGZhaWxlZCBhdHRlbXB0cyBhdCByZWNvdmVyeS4gVGltZSB0byB0cnkgYWdh aW4uICovCj4gLQlfX2NsZWFyX2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5mbGFncyk7Cj4gKwlp OTE1X2dlbV91bnNldF93ZWRnZWQoZGV2X3ByaXYpOwo+ICAJZXJyb3ItPnJlc2V0X2NvdW50Kys7 Cj4KPiAgCXByX25vdGljZSgiZHJtL2k5MTU6IFJlc2V0dGluZyBjaGlwIGFmdGVyIGdwdSBoYW5n XG4iKTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCA0OGZmNjQ4MTIyODkuLjUzYTc5 MWQ4ZDk5MiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0zNDA2LDYgKzM0MDYs NyBAQCBpbnQgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwo+ICB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7Cj4gIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7Cj4gIHZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwo+ICt2b2lkIGk5MTVfZ2VtX3Vuc2V0X3dlZGdl ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwo+Cj4gIHZvaWQgaTkxNV9nZW1f aW5pdF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKPiAgaW50IF9fbXVzdF9j aGVjayBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggMjAyYmI4NTBmMjYwLi5lMDY4MzA5MTZhMDUg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBAQCAtMzAwMCw2ICszMDAwLDU3IEBAIHZv aWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Cj4gIAltb2RfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9wcml2LT5ndC5pZGxlX3dv cmssIDApOwo+ICB9Cj4KPiArdm9pZCBpOTE1X2dlbV91bnNldF93ZWRnZWQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUpCj4gK3sKPiArCXN0cnVjdCBpOTE1X2dlbV90aW1lbGluZSAqdGw7 Cj4gKwlpbnQgaTsKPiArCj4gKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5kcm0uc3RydWN0 X211dGV4KTsKPiArCWlmICghdGVzdF9iaXQoSTkxNV9XRURHRUQsICZpOTE1LT5ncHVfZXJyb3Iu ZmxhZ3MpKQo+ICsJCXJldHVybjsKPiArCj4gKwkvKiBCZWZvcmUgdW53ZWRnaW5nLCBtYWtlIHN1 cmUgdGhhdCBhbGwgcGVuZGluZyBvcGVyYXRpb25zCj4gKwkgKiBhcmUgZmx1c2hlZCBhbmQgZXJy b3JlZCBvdXQuIE5vIG1vcmUgY2FuIGJlIHN1Ym1pdHRlZCB1bnRpbAo+ICsJICogd2UgcmVzZXQg dGhlIHdlZGdlZCBiaXQuCj4gKwkgKi8KPiArCWxpc3RfZm9yX2VhY2hfZW50cnkodGwsICZpOTE1 LT5ndC50aW1lbGluZXMsIGxpbmspIHsKPiArCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRSh0 bC0+ZW5naW5lKTsgaSsrKSB7Cj4gKwkJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7 Cj4gKwo+ICsJCQlycSA9IGk5MTVfZ2VtX2FjdGl2ZV9wZWVrKCZ0bC0+ZW5naW5lW2ldLmxhc3Rf cmVxdWVzdCwKPiArCQkJCQkJICAmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7Cj4gKwkJCWlmICgh cnEpCj4gKwkJCQljb250aW51ZTsKPiArCj4gKwkJCS8qIFdlIGNhbid0IHVzZSBvdXIgbm9ybWFs IHdhaXRlciBhcyB3ZSB3YW50IHRvCj4gKwkJCSAqIGF2b2lkIHJlY3Vyc2l2ZWx5IHRyeWluZyB0 byBoYW5kbGUgdGhlIGN1cnJlbnQKPiArCQkJICogcmVzZXQuIFRoZSBiYXNpYyBkbWFfZmVuY2Vf ZGVmYXVsdF93YWl0KCkgaW5zdGFsbHMKPiArCQkJICogYSBjYWxsYmFjayBmb3IgZG1hX2ZlbmNl X3NpZ25hbCgpLCB3aGljaCBpcwo+ICsJCQkgKiB0cmlnZ2VyZWQgYnkgb3VyIG5vcCBoYW5kbGVy IChpbmRpcmVjdGx5LCB0aGUKPiArCQkJICogY2FsbGJhY2sgZW5hYmxlcyB0aGUgc2lnbmFsZXIg dGhyZWFkIHdoaWNoIGlzCj4gKwkJCSAqIHdva2VuIGJ5IHRoZSBub3Bfc3VibWl0X3JlcXVlc3Qo KSBhZHZhbmNpbmcgdGhlIHNlcW5vCj4gKwkJCSAqIGFuZCB3aGVuIHRoZSBzZXFubyBwYXNzZXMg dGhlIGZlbmNlLCB0aGUgc2lnbmFsZXIKPiArCQkJICogdGhlbiBzaWduYWxzIHRoZSBmZW5jZSB3 YWtpbmcgdXMgdXApLgo+ICsJCQkgKi8KPiArCQkJZG1hX2ZlbmNlX2RlZmF1bHRfd2FpdCgmcnEt PmZlbmNlLCBmYWxzZSwKPiArCQkJCQkgICAgICAgTUFYX1NDSEVEVUxFX1RJTUVPVVQpOwo+ICsJ CX0KPiArCX0KPiArCj4gKwkvKiBVbmRvIG5vcF9zdWJtaXRfcmVxdWVzdC4gV2UgcHJldmVudCBh bGwgbmV3IGk5MTUgcmVxdWVzdHMgZnJvbQo+ICsJICogYmVpbmcgcXVldWVkIChieSBkaXNhbGxv d2luZyBleGVjYnVmIHdoaWxzdCB3ZWRnZWQpIHNvIGhhdmluZwo+ICsJICogd2FpdGVkIGZvciBh bGwgYWN0aXZlIHJlcXVlc3RzIGFib3ZlLCB3ZSBrbm93IHRoZSBzeXN0ZW0gaXMgaWRsZQo+ICsJ ICogYW5kIGRvIG5vdCBoYXZlIHRvIHdvcnJ5IGFib3V0IGEgdGhyZWFkIGJlaW5nIGluc2lkZQo+ ICsJICogZW5naW5lLT5zdWJtaXRfcmVxdWVzdCgpIGFzIHdlIHN3YXAgb3Zlci4gU28gdW5saWtl IGluc3RhbGxpbmcKPiArCSAqIHRoZSBub3Bfc3VibWl0X3JlcXVlc3Qgb24gcmVzZXQsIHdlIGNh biBkbyB0aGlzIGZyb20gbm9ybWFsCj4gKwkgKiBjb250ZXh0IGFuZCBkbyBub3QgcmVxdWlyZSBz dG9wX21hY2hpbmUoKS4KPiArCSAqLwo+ICsJaW50ZWxfZW5naW5lc19lbmFibGVfc3VibWlzc2lv bihpOTE1KTsKClNvIHRoZSBwb2ludCBvZiB0aGUgZG1hX2ZlbmNlX2RlZmF1bHRfd2FpdCBhYm92 ZSBpcyBpdCB0byBlbnN1cmUgYWxsIApub3Bfc3VibWl0X3JlcXVlc3QgY2FsbCBiYWNrcyBoYXZl IGNvbXBsZXRlZD8gSSBkb24ndCBhdCB0aGUgbW9tZW50IAp1bmRlcnN0YW5kIGhvdyBjb3VsZCB0 aGVyZSBiZSBzdWNoIGNhbGxiYWNrcyBzaW5jZSB1bndlZGdlIGlzIGhhcHBlbmluZyAKYWZ0ZXIg dGhlIHdlZGdlLiBTbyB0aGUgd2VkZ2UgYWxyZWFkeSBpbnN0YWxsZWQgdGhlIG5vcCBoYW5kbGVy LCBhbmQgYnkgCnRoZSB0aW1lIHdlIGdldCB0byBhbm90aGVyIHJlc2V0IGF0dGVtcHQsIGlzbid0 IGl0IGFscmVhZHkgZ3VhcmFudGVlZCAKYWxsIG9mIHRob3NlIGhhdmUgZXhpdGVkPwoKUmVnYXJk cywKClR2cnRrbwoKPiArCj4gKwlzbXBfbWJfX2JlZm9yZV9hdG9taWMoKTsgLyogY29tcGxldGUg dGFrZW92ZXIgYmVmb3JlIGVuYWJsaW5nIGV4ZWNidWYgKi8KPiArCWNsZWFyX2JpdChJOTE1X1dF REdFRCwgJmk5MTUtPmdwdV9lcnJvci5mbGFncyk7Cj4gK30KPiArCj4gIHN0YXRpYyB2b2lkCj4g IGk5MTVfZ2VtX3JldGlyZV93b3JrX2hhbmRsZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ ICB7Cj4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==