From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH v4 11/16] drm/i915: Remove the preempted request from the execution queue Date: Thu, 23 Feb 2017 12:11:34 +0000 Message-ID: <54b7564f-cd29-2282-3abf-ac5864864e2d@linux.intel.com> References: <20170223074422.4125-1-chris@chris-wilson.co.uk> <20170223074422.4125-12-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F95E6E9DB for ; Thu, 23 Feb 2017 12:11:40 +0000 (UTC) In-Reply-To: <20170223074422.4125-12-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 Ck9uIDIzLzAyLzIwMTcgMDc6NDQsIENocmlzIFdpbHNvbiB3cm90ZToKPiBBZnRlciB0aGUgcmVx dWVzdCBpcyBjYW5jZWxsZWQsIHdlIHRoZW4gbmVlZCB0byByZW1vdmUgaXQgZnJvbSB0aGUKPiBn bG9iYWwgZXhlY3V0aW9uIHRpbWVsaW5lIGFuZCByZXR1cm4gaXQgdG8gdGhlIGNvbnRleHQgdGlt ZWxpbmUsIHRoZQo+IGludmVyc2Ugb2Ygc3VibWl0X3JlcXVlc3QoKS4KPgo+IHYyOiBNb3ZlIG1h bmlwdWxhdGlvbiBvZiBzdHJ1Y3QgaW50ZWxfd2FpdCB0byBoZWxwZXJzCj4KPiBTaWduZWQtb2Zm LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPiBDYzogVHZydGtv IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jICB8IDU1ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3Qu aCAgfCAgMyArKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jIHwg MTcgKysrKysrKystLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDczIGluc2VydGlvbnMoKyksIDIgZGVs ZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f cmVxdWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCj4gaW5k ZXggNWVkNTI1MjEzOTdmLi43NmUzMWNkNzg0MGUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fcmVxdWVzdC5jCj4gQEAgLTQ0MSw2ICs0NDEsNTUgQEAgdm9pZCBpOTE1X2dlbV9y ZXF1ZXN0X3N1Ym1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCj4gIAlz cGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBmbGFncyk7Cj4g IH0KPgo+ICt2b2lkIF9faTkxNV9nZW1fcmVxdWVzdF91bnN1Ym1pdChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3QpCj4gK3sKPiArCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSA9IHJlcXVlc3QtPmVuZ2luZTsKPiArCXN0cnVjdCBpbnRlbF90aW1lbGluZSAqdGltZWxp bmU7Cj4gKwo+ICsJYXNzZXJ0X3NwaW5fbG9ja2VkKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsK PiArCj4gKwkvKiBPbmx5IHVud2luZCBpbiByZXZlcnNlIG9yZGVyLCByZXF1aXJlZCBzbyB0aGF0 IHRoZSBwZXItY29udGV4dCBsaXN0Cj4gKwkgKiBpcyBrZXB0IGluIHNlcW5vL3Jpbmcgb3JkZXIu Cj4gKwkgKi8KPiArCUdFTV9CVUdfT04ocmVxdWVzdC0+Z2xvYmFsX3NlcW5vICE9IGVuZ2luZS0+ dGltZWxpbmUtPnNlcW5vKTsKPiArCWVuZ2luZS0+dGltZWxpbmUtPnNlcW5vLS07Cj4gKwo+ICsJ LyogV2UgbWF5IGJlIHJlY3Vyc2luZyBmcm9tIHRoZSBzaWduYWwgY2FsbGJhY2sgb2YgYW5vdGhl ciBpOTE1IGZlbmNlICovCj4gKwlzcGluX2xvY2tfbmVzdGVkKCZyZXF1ZXN0LT5sb2NrLCBTSU5H TEVfREVQVEhfTkVTVElORyk7Cj4gKwlyZXF1ZXN0LT5nbG9iYWxfc2Vxbm8gPSAwOwo+ICsJaWYg KHRlc3RfYml0KERNQV9GRU5DRV9GTEFHX0VOQUJMRV9TSUdOQUxfQklULCAmcmVxdWVzdC0+ZmVu Y2UuZmxhZ3MpKQo+ICsJCWludGVsX2VuZ2luZV9jYW5jZWxfc2lnbmFsaW5nKHJlcXVlc3QpOwo+ ICsJc3Bpbl91bmxvY2soJnJlcXVlc3QtPmxvY2spOwo+ICsKPiArCS8qIFRyYW5zZmVyIGJhY2sg ZnJvbSB0aGUgZ2xvYmFsIHBlci1lbmdpbmUgdGltZWxpbmUgdG8gcGVyLWNvbnRleHQgKi8KPiAr CXRpbWVsaW5lID0gcmVxdWVzdC0+dGltZWxpbmU7Cj4gKwlHRU1fQlVHX09OKHRpbWVsaW5lID09 IGVuZ2luZS0+dGltZWxpbmUpOwo+ICsKPiArCXNwaW5fbG9jaygmdGltZWxpbmUtPmxvY2spOwo+ ICsJbGlzdF9tb3ZlKCZyZXF1ZXN0LT5saW5rLCAmdGltZWxpbmUtPnJlcXVlc3RzKTsKPiArCXNw aW5fdW5sb2NrKCZ0aW1lbGluZS0+bG9jayk7Cj4gKwo+ICsJLyogV2UgZG9uJ3QgbmVlZCB0byB3 YWtlX3VwIGFueSB3YWl0ZXJzIG9uIHJlcXVlc3QtPmV4ZWN1dGUsIHRoZXkKPiArCSAqIHdpbGwg Z2V0IHdva2VuIGJ5IGFueSBvdGhlciBldmVudCBvciB1cyByZS1hZGRpbmcgdGhpcyByZXF1ZXN0 Cj4gKwkgKiB0byB0aGUgZW5naW5lIHRpbWVsaW5lIChfX2k5MTVfZ2VtX3JlcXVlc3Rfc3VibWl0 KCkpLiBUaGUgd2FpdGVycwo+ICsJICogc2hvdWxkIGJlIHF1aXRlIGFkYXB0IGF0IGZpbmRpbmcg dGhhdCB0aGUgcmVxdWVzdCBub3cgaGFzIGEgbmV3Cj4gKwkgKiBnbG9iYWxfc2Vxbm8gdG8gdGhl IG9uZSB0aGV5IHdlbnQgdG8gc2xlZXAgb24uCj4gKwkgKi8KPiArfQo+ICsKPiArdm9pZCBpOTE1 X2dlbV9yZXF1ZXN0X3Vuc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dCkKPiArewo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxdWVzdC0+ZW5n aW5lOwo+ICsJdW5zaWduZWQgbG9uZyBmbGFnczsKPiArCj4gKwkvKiBXaWxsIGJlIGNhbGxlZCBm cm9tIGlycS1jb250ZXh0IHdoZW4gdXNpbmcgZm9yZWlnbiBmZW5jZXMuICovCj4gKwlzcGluX2xv Y2tfaXJxc2F2ZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwo+ICsKPiArCV9faTkx NV9nZW1fcmVxdWVzdF91bnN1Ym1pdChyZXF1ZXN0KTsKPiArCj4gKwlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBmbGFncyk7Cj4gK30KPiArCj4gIHN0YXRp YyBpbnQgX19pOTE1X3N3X2ZlbmNlX2NhbGwKPiAgc3VibWl0X25vdGlmeShzdHJ1Y3QgaTkxNV9z d19mZW5jZSAqZmVuY2UsIGVudW0gaTkxNV9zd19mZW5jZV9ub3RpZnkgc3RhdGUpCj4gIHsKPiBA QCAtMTAzNiw2ICsxMDg1LDcgQEAgbG9uZyBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSwKPgo+ICAJaW50ZWxfd2FpdF9pbml0KCZ3YWl0KTsKPgo+ICty ZXN0YXJ0Ogo+ICAJcmVzZXRfd2FpdF9xdWV1ZSgmcmVxLT5leGVjdXRlLCAmZXhlYyk7Cj4gIAlp ZiAoIWludGVsX3dhaXRfdXBkYXRlX3JlcXVlc3QoJndhaXQsIHJlcSkpIHsKPiAgCQlkbyB7Cj4g QEAgLTExMzQsNiArMTE4NCwxMSBAQCBsb25nIGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxLAo+ICAJCS8qIE9ubHkgc3BpbiBpZiB3ZSBrbm93IHRoZSBH UFUgaXMgcHJvY2Vzc2luZyB0aGlzIHJlcXVlc3QgKi8KPiAgCQlpZiAoaTkxNV9zcGluX3JlcXVl c3QocmVxLCBzdGF0ZSwgMikpCj4gIAkJCWJyZWFrOwo+ICsKPiArCQlpZiAoIWludGVsX3dhaXRf Y2hlY2tfcmVxdWVzdCgmd2FpdCwgcmVxKSkgewo+ICsJCQlpbnRlbF9lbmdpbmVfcmVtb3ZlX3dh aXQocmVxLT5lbmdpbmUsICZ3YWl0KTsKPiArCQkJZ290byByZXN0YXJ0Owo+ICsJCX0KPiAgCX0K Pgo+ICAJaW50ZWxfZW5naW5lX3JlbW92ZV93YWl0KHJlcS0+ZW5naW5lLCAmd2FpdCk7Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaAo+IGluZGV4IGI4MWY2NzA5OTA1Yy4u NWY3M2Q4YzBhMzhhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3JlcXVlc3QuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3Qu aAo+IEBAIC0yNzQsNiArMjc0LDkgQEAgdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIGJvb2wgZmx1c2hfY2FjaGVzKTsKPiAgdm9pZCBfX2k5 MTVfZ2VtX3JlcXVlc3Rfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dCk7Cj4gIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXF1ZXN0KTsKPgo+ICt2b2lkIF9faTkxNV9nZW1fcmVxdWVzdF91bnN1Ym1pdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwo+ICt2b2lkIGk5MTVfZ2VtX3Jl cXVlc3RfdW5zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKPiAr Cj4gIHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50Owo+ICAjZGVmaW5lIE5PX1dBSVRCT09TVCBFUlJf UFRSKC0xKQo+ICAjZGVmaW5lIElTX1JQU19DTElFTlQocCkgKCFJU19FUlIocCkpCj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJzLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jCj4gaW5kZXggZGQzOWU0ZjdhNTYwLi4w MjdjOTNlMzRjOTcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJl YWRjcnVtYnMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJz LmMKPiBAQCAtNDUzLDcgKzQ1MywxMiBAQCB2b2lkIGludGVsX2VuZ2luZV9yZW1vdmVfd2FpdChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCj4gIAlzcGluX3VubG9ja19pcnEoJmItPmxv Y2spOwo+ICB9Cj4KPiAtc3RhdGljIGJvb2wgc2lnbmFsX2NvbXBsZXRlKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKPiArc3RhdGljIGJvb2wgc2lnbmFsX3ZhbGlkKGNvbnN0 IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKPiArewo+ICsJcmV0dXJuIGlu dGVsX3dhaXRfY2hlY2tfcmVxdWVzdCgmcmVxdWVzdC0+c2lnbmFsaW5nLndhaXQsIHJlcXVlc3Qp Owo+ICt9Cj4gKwo+ICtzdGF0aWMgYm9vbCBzaWduYWxfY29tcGxldGUoY29uc3Qgc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQo+ICB7Cj4gIAlpZiAoIXJlcXVlc3QpCj4gIAkJ cmV0dXJuIGZhbHNlOwo+IEBAIC00NjIsNyArNDY3LDcgQEAgc3RhdGljIGJvb2wgc2lnbmFsX2Nv bXBsZXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKPiAgCSAqIHNpZ25h bGxlZCB0aGF0IHRoaXMgd2FpdCBpcyBhbHJlYWR5IGNvbXBsZXRlZC4KPiAgCSAqLwo+ICAJaWYg KGludGVsX3dhaXRfY29tcGxldGUoJnJlcXVlc3QtPnNpZ25hbGluZy53YWl0KSkKPiAtCQlyZXR1 cm4gdHJ1ZTsKPiArCQlyZXR1cm4gc2lnbmFsX3ZhbGlkKHJlcXVlc3QpOwo+Cj4gIAkvKiBDYXJl ZnVsbHkgY2hlY2sgaWYgdGhlIHJlcXVlc3QgaXMgY29tcGxldGUsIGdpdmluZyB0aW1lIGZvciB0 aGUKPiAgCSAqIHNlcW5vIHRvIGJlIHZpc2libGUgb3IgaWYgdGhlIEdQVSBodW5nLgo+IEBAIC01 NDIsMTMgKzU0NywyMSBAQCBzdGF0aWMgaW50IGludGVsX2JyZWFkY3J1bWJzX3NpZ25hbGVyKHZv aWQgKmFyZykKPgo+ICAJCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChyZXF1ZXN0KTsKPiAgCQl9IGVs c2Ugewo+ICsJCQlERUZJTkVfV0FJVChleGVjKTsKPiArCj4gIAkJCWlmIChrdGhyZWFkX3Nob3Vs ZF9zdG9wKCkpIHsKPiAgCQkJCUdFTV9CVUdfT04ocmVxdWVzdCk7Cj4gIAkJCQlicmVhazsKPiAg CQkJfQo+Cj4gKwkJCWlmIChyZXF1ZXN0KQo+ICsJCQkJYWRkX3dhaXRfcXVldWUoJnJlcXVlc3Qt PmV4ZWN1dGUsICZleGVjKTsKPiArCj4gIAkJCXNjaGVkdWxlKCk7Cj4KPiArCQkJaWYgKHJlcXVl c3QpCj4gKwkJCQlyZW1vdmVfd2FpdF9xdWV1ZSgmcmVxdWVzdC0+ZXhlY3V0ZSwgJmV4ZWMpOwo+ ICsKPiAgCQkJaWYgKGt0aHJlYWRfc2hvdWxkX3BhcmsoKSkKPiAgCQkJCWt0aHJlYWRfcGFya21l KCk7Cj4gIAkJfQo+CgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KClJlZ2FyZHMsCgpUdnJ0a28KCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=