From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH v2 09/15] drm/i915: Allow an request to be cancelled Date: Wed, 22 Feb 2017 13:08:22 +0000 Message-ID: <0786064d-6fb6-fd13-f2bb-07ef5a6bf5bf@linux.intel.com> References: <20170222114610.5819-1-chris@chris-wilson.co.uk> <20170222114610.5819-10-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 2309E6E03B for ; Wed, 22 Feb 2017 13:08:26 +0000 (UTC) In-Reply-To: <20170222114610.5819-10-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 Ck9uIDIyLzAyLzIwMTcgMTE6NDYsIENocmlzIFdpbHNvbiB3cm90ZToKPiBJZiB3ZSBwcmVlbXB0 IGEgcmVxdWVzdCBhbmQgcmVtb3ZlIGl0IGZyb20gdGhlIGV4ZWN1dGlvbiBxdWV1ZSwgd2UgbmVl ZAo+IHRvIHVuZG8gaXRzIGdsb2JhbCBzZXFubyBhbmQgcmVzdGFydCBhbnkgd2FpdGVycy4KPgo+ IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+ IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jIHwgNzEgKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oICB8ICAxICsKPiAgMiBmaWxlcyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25z KCspLCAxNSBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9icmVhZGNydW1icy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRj cnVtYnMuYwo+IGluZGV4IDYyZTZiODE4MTIwMC4uODgyZTYwMWViYjA5IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJzLmMKPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jCj4gQEAgLTM1NiwyMiArMzU2LDE1IEBA IHN0YXRpYyBpbmxpbmUgaW50IHdha2V1cF9wcmlvcml0eShzdHJ1Y3QgaW50ZWxfYnJlYWRjcnVt YnMgKmIsCj4gIAkJcmV0dXJuIHRzay0+cHJpbzsKPiAgfQo+Cj4gLXZvaWQgaW50ZWxfZW5naW5l X3JlbW92ZV93YWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKPiAtCQkJICAgICAg c3RydWN0IGludGVsX3dhaXQgKndhaXQpCj4gK3N0YXRpYyB2b2lkIF9faW50ZWxfZW5naW5lX3Jl bW92ZV93YWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKPiArCQkJCSAgICAgICBz dHJ1Y3QgaW50ZWxfd2FpdCAqd2FpdCkKPiAgewo+ICAJc3RydWN0IGludGVsX2JyZWFkY3J1bWJz ICpiID0gJmVuZ2luZS0+YnJlYWRjcnVtYnM7Cj4KPiAtCS8qIFF1aWNrIGNoZWNrIHRvIHNlZSBp ZiB0aGlzIHdhaXRlciB3YXMgYWxyZWFkeSBkZWNvdXBsZWQgZnJvbQo+IC0JICogdGhlIHRyZWUg YnkgdGhlIGJvdHRvbS1oYWxmIHRvIGF2b2lkIGNvbnRlbnRpb24gb24gdGhlIHNwaW5sb2NrCj4g LQkgKiBieSB0aGUgaGVyZC4KPiAtCSAqLwo+IC0JaWYgKFJCX0VNUFRZX05PREUoJndhaXQtPm5v ZGUpKQo+IC0JCXJldHVybjsKPiAtCj4gLQlzcGluX2xvY2tfaXJxKCZiLT5sb2NrKTsKPiArCWFz c2VydF9zcGluX2xvY2tlZCgmYi0+bG9jayk7Cj4KPiAgCWlmIChSQl9FTVBUWV9OT0RFKCZ3YWl0 LT5ub2RlKSkKPiAtCQlnb3RvIG91dF91bmxvY2s7Cj4gKwkJZ290byBvdXQ7Cj4KPiAgCWlmIChi LT5maXJzdF93YWl0ID09IHdhaXQpIHsKPiAgCQljb25zdCBpbnQgcHJpb3JpdHkgPSB3YWtldXBf cHJpb3JpdHkoYiwgd2FpdC0+dHNrKTsKPiBAQCAtNDM2LDExICs0MjksMjcgQEAgdm9pZCBpbnRl bF9lbmdpbmVfcmVtb3ZlX3dhaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAo+ICAJ R0VNX0JVR19PTihSQl9FTVBUWV9OT0RFKCZ3YWl0LT5ub2RlKSk7Cj4gIAlyYl9lcmFzZSgmd2Fp dC0+bm9kZSwgJmItPndhaXRlcnMpOwo+Cj4gLW91dF91bmxvY2s6Cj4gK291dDoKPiAgCUdFTV9C VUdfT04oYi0+Zmlyc3Rfd2FpdCA9PSB3YWl0KTsKPiAgCUdFTV9CVUdfT04ocmJfZmlyc3QoJmIt PndhaXRlcnMpICE9Cj4gIAkJICAgKGItPmZpcnN0X3dhaXQgPyAmYi0+Zmlyc3Rfd2FpdC0+bm9k ZSA6IE5VTEwpKTsKPiAgCUdFTV9CVUdfT04oIXJjdV9hY2Nlc3NfcG9pbnRlcihiLT5pcnFfc2Vx bm9fYmgpIF4gUkJfRU1QVFlfUk9PVCgmYi0+d2FpdGVycykpOwo+ICt9Cj4gKwo+ICt2b2lkIGlu dGVsX2VuZ2luZV9yZW1vdmVfd2FpdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCj4g KwkJCSAgICAgIHN0cnVjdCBpbnRlbF93YWl0ICp3YWl0KQo+ICt7Cj4gKwlzdHJ1Y3QgaW50ZWxf YnJlYWRjcnVtYnMgKmIgPSAmZW5naW5lLT5icmVhZGNydW1iczsKPiArCj4gKwkvKiBRdWljayBj aGVjayB0byBzZWUgaWYgdGhpcyB3YWl0ZXIgd2FzIGFscmVhZHkgZGVjb3VwbGVkIGZyb20KPiAr CSAqIHRoZSB0cmVlIGJ5IHRoZSBib3R0b20taGFsZiB0byBhdm9pZCBjb250ZW50aW9uIG9uIHRo ZSBzcGlubG9jawo+ICsJICogYnkgdGhlIGhlcmQuCj4gKwkgKi8KPiArCWlmIChSQl9FTVBUWV9O T0RFKCZ3YWl0LT5ub2RlKSkKPiArCQlyZXR1cm47Cj4gKwo+ICsJc3Bpbl9sb2NrX2lycSgmYi0+ bG9jayk7Cj4gKwlfX2ludGVsX2VuZ2luZV9yZW1vdmVfd2FpdChlbmdpbmUsIHdhaXQpOwo+ICAJ c3Bpbl91bmxvY2tfaXJxKCZiLT5sb2NrKTsKPiAgfQo+Cj4gQEAgLTUwNiwxMSArNTE1LDEzIEBA IHN0YXRpYyBpbnQgaW50ZWxfYnJlYWRjcnVtYnNfc2lnbmFsZXIodm9pZCAqYXJnKQo+ICAJCQlk bWFfZmVuY2Vfc2lnbmFsKCZyZXF1ZXN0LT5mZW5jZSk7Cj4gIAkJCWxvY2FsX2JoX2VuYWJsZSgp OyAvKiBraWNrIHN0YXJ0IHRoZSB0YXNrbGV0cyAqLwo+Cj4gKwkJCXNwaW5fbG9ja19pcnEoJmIt PmxvY2spOwo+ICsKPiAgCQkJLyogV2FrZSB1cCBhbGwgb3RoZXIgY29tcGxldGVkIHdhaXRlcnMg YW5kIHNlbGVjdCB0aGUKPiAgCQkJICogbmV4dCBib3R0b20taGFsZiBmb3IgdGhlIG5leHQgdXNl ciBpbnRlcnJ1cHQuCj4gIAkJCSAqLwo+IC0JCQlpbnRlbF9lbmdpbmVfcmVtb3ZlX3dhaXQoZW5n aW5lLAo+IC0JCQkJCQkgJnJlcXVlc3QtPnNpZ25hbGluZy53YWl0KTsKPiArCQkJX19pbnRlbF9l bmdpbmVfcmVtb3ZlX3dhaXQoZW5naW5lLAo+ICsJCQkJCQkgICAmcmVxdWVzdC0+c2lnbmFsaW5n LndhaXQpOwo+Cj4gIAkJCS8qIEZpbmQgdGhlIG5leHQgb2xkZXN0IHNpZ25hbC4gTm90ZSB0aGF0 IGFzIHdlIGhhdmUKPiAgCQkJICogbm90IGJlZW4gaG9sZGluZyB0aGUgbG9jaywgYW5vdGhlciBj bGllbnQgbWF5Cj4gQEAgLTUxOCw3ICs1MjksNiBAQCBzdGF0aWMgaW50IGludGVsX2JyZWFkY3J1 bWJzX3NpZ25hbGVyKHZvaWQgKmFyZykKPiAgCQkJICogd2UganVzdCBjb21wbGV0ZWQgLSBzbyBk b3VibGUgY2hlY2sgd2UgYXJlIHN0aWxsCj4gIAkJCSAqIHRoZSBvbGRlc3QgYmVmb3JlIHBpY2tp bmcgdGhlIG5leHQgb25lLgo+ICAJCQkgKi8KPiAtCQkJc3Bpbl9sb2NrX2lycSgmYi0+bG9jayk7 Cj4gIAkJCWlmIChyZXF1ZXN0ID09IHJjdV9hY2Nlc3NfcG9pbnRlcihiLT5maXJzdF9zaWduYWwp KSB7Cj4gIAkJCQlzdHJ1Y3QgcmJfbm9kZSAqcmIgPQo+ICAJCQkJCXJiX25leHQoJnJlcXVlc3Qt PnNpZ25hbGluZy5ub2RlKTsKPiBAQCAtNTI2LDYgKzUzNiw4IEBAIHN0YXRpYyBpbnQgaW50ZWxf YnJlYWRjcnVtYnNfc2lnbmFsZXIodm9pZCAqYXJnKQo+ICAJCQkJCQkgICByYiA/IHRvX3NpZ25h bGVyKHJiKSA6IE5VTEwpOwo+ICAJCQl9Cj4gIAkJCXJiX2VyYXNlKCZyZXF1ZXN0LT5zaWduYWxp bmcubm9kZSwgJmItPnNpZ25hbHMpOwo+ICsJCQlSQl9DTEVBUl9OT0RFKCZyZXF1ZXN0LT5zaWdu YWxpbmcubm9kZSk7Cj4gKwo+ICAJCQlzcGluX3VubG9ja19pcnEoJmItPmxvY2spOwo+Cj4gIAkJ CWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHJlcXVlc3QpOwo+IEBAIC02MTMsNiArNjI1LDM1IEBAIHZv aWQgaW50ZWxfZW5naW5lX2VuYWJsZV9zaWduYWxpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0KQo+ICAJCXdha2VfdXBfcHJvY2VzcyhiLT5zaWduYWxlcik7Cj4gIH0KPgo+ ICt2b2lkIGludGVsX2VuZ2luZV9jYW5jZWxfc2lnbmFsaW5nKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKPiArewo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l ID0gcmVxdWVzdC0+ZW5naW5lOwo+ICsJc3RydWN0IGludGVsX2JyZWFkY3J1bWJzICpiID0gJmVu Z2luZS0+YnJlYWRjcnVtYnM7Cj4gKwo+ICsJYXNzZXJ0X3NwaW5fbG9ja2VkKCZyZXF1ZXN0LT5s b2NrKTsKPiArCUdFTV9CVUdfT04oIXJlcXVlc3QtPnNpZ25hbGluZy53YWl0LnNlcW5vKTsKPiAr Cj4gKwlzcGluX2xvY2soJmItPmxvY2spOwo+ICsKPiArCWlmICghUkJfRU1QVFlfTk9ERSgmcmVx dWVzdC0+c2lnbmFsaW5nLm5vZGUpKSB7Cj4gKwkJaWYgKHJlcXVlc3QgPT0gcmN1X2FjY2Vzc19w b2ludGVyKGItPmZpcnN0X3NpZ25hbCkpIHsKPiArCQkJc3RydWN0IHJiX25vZGUgKnJiID0KPiAr CQkJCXJiX25leHQoJnJlcXVlc3QtPnNpZ25hbGluZy5ub2RlKTsKPiArCQkJcmN1X2Fzc2lnbl9w b2ludGVyKGItPmZpcnN0X3NpZ25hbCwKPiArCQkJCQkgICByYiA/IHRvX3NpZ25hbGVyKHJiKSA6 IE5VTEwpOwo+ICsJCX0KPiArCQlyYl9lcmFzZSgmcmVxdWVzdC0+c2lnbmFsaW5nLm5vZGUsICZi LT5zaWduYWxzKTsKPiArCQlSQl9DTEVBUl9OT0RFKCZyZXF1ZXN0LT5zaWduYWxpbmcubm9kZSk7 Cj4gKwl9Cj4gKwo+ICsJX19pbnRlbF9lbmdpbmVfcmVtb3ZlX3dhaXQoZW5naW5lLCAmcmVxdWVz dC0+c2lnbmFsaW5nLndhaXQpOwo+ICsKPiArCXNwaW5fdW5sb2NrKCZiLT5sb2NrKTsKPiArCj4g KwlyZXF1ZXN0LT5zaWduYWxpbmcud2FpdC5zZXFubyA9IDA7Cj4gKwlpOTE1X2dlbV9yZXF1ZXN0 X3B1dChyZXF1ZXN0KTsKPiArfQo+ICsKPiAgaW50IGludGVsX2VuZ2luZV9pbml0X2JyZWFkY3J1 bWJzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgewo+ICAJc3RydWN0IGludGVs X2JyZWFkY3J1bWJzICpiID0gJmVuZ2luZS0+YnJlYWRjcnVtYnM7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAo+IGluZGV4IDNmY2I5ZGQxOWIwNy4uNDVkMmMyZmE5NDZl IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAo+IEBAIC01OTgs NiArNTk4LDcgQEAgYm9vbCBpbnRlbF9lbmdpbmVfYWRkX3dhaXQoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lLAo+ICB2b2lkIGludGVsX2VuZ2luZV9yZW1vdmVfd2FpdChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUsCj4gIAkJCSAgICAgIHN0cnVjdCBpbnRlbF93YWl0ICp3YWl0 KTsKPiAgdm9pZCBpbnRlbF9lbmdpbmVfZW5hYmxlX3NpZ25hbGluZyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3QpOwo+ICt2b2lkIGludGVsX2VuZ2luZV9jYW5jZWxfc2lnbmFs aW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCk7Cj4KPiAgc3RhdGljIGlu bGluZSBib29sIGludGVsX2VuZ2luZV9oYXNfd2FpdGVyKGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKPiAgewo+CgpJIHBlZWtlZCBhaGVhZCBhIGJpdCB0byBzZWUgaG93IGl0 IHdpbGwgYmUgdXNlZCBhbmQgaXQgbG9va3MgZmluZS4KClJldmlld2VkLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgoKUmVnYXJkcywKClR2cnRrbwpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK