From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/3] drm/i915: Fix some invalid requests cancellations Date: Mon, 15 Feb 2016 10:47:26 +0100 Message-ID: <20160215094726.GH11240@phenom.ffwll.local> References: <1454086145-16160-1-git-send-email-chris@chris-wilson.co.uk> <1454086145-16160-2-git-send-email-chris@chris-wilson.co.uk> <56BC862E.2020305@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77B706E19B for ; Mon, 15 Feb 2016 09:47:01 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id a4so47877958wme.1 for ; Mon, 15 Feb 2016 01:47:01 -0800 (PST) Content-Disposition: inline In-Reply-To: <56BC862E.2020305@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Tvrtko Ursulin Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBGZWIgMTEsIDIwMTYgYXQgMDE6MDE6MzRQTSArMDAwMCwgVHZydGtvIFVyc3VsaW4g d3JvdGU6Cj4gT24gMjkvMDEvMTYgMTY6NDksIENocmlzIFdpbHNvbiB3cm90ZToKPiA+QXMgd2Ug YWRkIHRoZSBWTUEgdG8gdGhlIHJlcXVlc3QgZWFybHksIGl0IG1heSBiZSBjYW5jZWxsZWQgZHVy aW5nCj4gPmV4ZWNidWYgcmVzZXJ2YXRpb24uIFRoaXMgd2lsbCBsZWF2ZSB0aGUgY29udGV4dCBv YmplY3QgcG9pbnRpbmcgdG8gYQo+IAo+IEkgZG9uJ3QgZ2V0IGl0LCByZXF1ZXN0IGlzIGNyZWF0 ZWQgYWZ0ZXIgdGhlIHJlc2VydmF0aW9uLgoKVGhhdCdzIHRoZSBwcm9ibGVtIC0gd2UgYWRkIHZt YSBmb3IgYSBnaXZlbiByZXF1ZXN0ICh3ZWxsIHJpbmcvc2Vxbm8gcGFpcikKYmVmb3JlIHRoYXQg cmVxdWVzdCBleGlzdHMuCi1EYW5pZWwKCj4gCj4gPmRhbmdsaW5nIHJlcXVlc3Q7IGk5MTVfd2Fp dF9yZXF1ZXN0KCkgc2ltcGx5IHNraXBzIHRoZSB3YWl0IGFuZCBzbyB3ZQo+ID5tYXkgdW5iaW5k IHRoZSBvYmplY3Qgd2hpbHN0IGl0IGlzIHN0aWxsIGFjdGl2ZS4KPiA+Cj4gPkhvd2V2ZXIsIGlm IGF0IGFueSBwb2ludCB3ZSBtYWtlIGEgY2hhbmdlIHRvIHRoZSBoYXJkd2FyZSAoYW5kIGVxdWFs bHkKPiA+aW1wb3J0YW50bHkgb3VyIGJvb2trZWVwaW5nIGluIHRoZSBkcml2ZXIpLCB3ZSBjYW5u b3QgY2FuY2VsIHRoZSByZXF1ZXN0Cj4gPmFzIHdoYXQgaGFzIGFscmVhZHkgYmVlbiB3cml0dGVu IG11c3QgYmUgc3VibWl0dGVkLiBTdWJtaXR0aW5nIGEgcGFydGlhbAo+ID5yZXF1ZXN0IGlzIGZh ciBlYXNpZXIgdGhhbiB0cnlpbmcgdG8gdW53aW5kIHRoZSBpbmNvbXBsZXRlIGNoYW5nZS4KPiA+ Cj4gPlVuZm9ydHVuYXRlbHkgdGhpcyBwYXRjaCB1bmRvZXMgdGhlIGV4Y2VzcyBicmVhZGNydW1i IHVzYWdlIHRoYXQgb2xyCj4gPnByZXZlbnRlZCwgZS5nLiBpZiB3ZSBpbnRlcnJ1cHQgYmF0Y2hi dWZmZXIgc3VibWlzc2lvbiB0aGVuIHdlIHN1Ym1pdAo+ID50aGUgcmVxdWVzdHMgYWxvbmcgd2l0 aCB0aGUgbWVtb3J5IHdyaXRlcyBhbmQgaW50ZXJydXB0IChldmVuIHRob3VnaCB3ZQo+ID5kbyBu byByZWFsIHdvcmspLiBEaXNhc3NvY2lhdGluZyByZXF1ZXN0cyBmcm9tIGJyZWFkY3J1bWJzIChh bmQKPiA+c2VtYXBob3JlcykgaXMgYSB0b3BpYyBmb3IgYSBwYXN0L2Z1dHVyZSBzZXJpZXMsIGJ1 dCBub3cgbXVjaCBtb3JlCj4gPmltcG9ydGFudC4KPiA+Cj4gPnYyOiBSZWJhc2UKPiA+Cj4gPk5v dGUgdGhhdCBpZ3QvZ2VtX2NvbmN1cnJlbnRfYmxpdCB0aWdnZXJzIGJvdGggbWlzcmVuZGVyaW5n IGFuZCBhIEdQRgo+ID50aGF0IGlzIGZpeGVkIGJ5IHRoaXMgcGF0Y2guCj4gPgo+ID5CdWd6aWxs YTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM5MDcKPiA+ VGVzdGNhc2U6IGlndC9nZW1fY29uY3VycmVudF9ibGl0Cj4gPlNpZ25lZC1vZmYtYnk6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+ID5DYzogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiA+Q2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPiA+ LS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgIDEg LQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICA3ICsr LS0tLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAy MSArKysrKysrKystLS0tLS0tLS0tLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMgfCAxNiArKysrKy0tLS0tLS0tLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAgIHwgIDIgKy0KPiA+ICBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgMSAtCj4gPiAgNiBmaWxlcyBjaGFuZ2VkLCAx NyBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKPiA+Cj4gPmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAo+ID5pbmRleCBhMmQyZjA4Yjc1MTUuLmY4MjhhN2ZmZWQzNyAxMDA2NDQKPiA+LS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+ID4rKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCj4gPkBAIC0yODIzLDcgKzI4MjMsNiBAQCBpbnQgaTkxNV9nZW1fc3df ZmluaXNoX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gPiAgCQkJ ICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7Cj4gPiAgdm9pZCBpOTE1X2dlbV9leGVj YnVmZmVyX21vdmVfdG9fYWN0aXZlKHN0cnVjdCBsaXN0X2hlYWQgKnZtYXMsCj4gPiAgCQkJCQlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7Cj4gPi12b2lkIGk5MTVfZ2VtX2V4ZWNi dWZmZXJfcmV0aXJlX2NvbW1hbmRzKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJh bXMpOwo+ID4gIGludCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVf ZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKPiA+ICAJCQkJICAgc3RydWN0IGRybV9pOTE1X2dl bV9leGVjYnVmZmVyMiAqYXJncywKPiA+ICAJCQkJICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcyk7 Cj4gPmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ID5pbmRleCBlOWIxOWJjYTEzODMuLmY3NjRmMzM1 ODBmYyAxMDA2NDQKPiA+LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ID4r KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gPkBAIC0zNDA3LDEyICszNDA3 LDkgQEAgaW50IGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiA+ICAJCQkJ cmV0dXJuIFBUUl9FUlIocmVxKTsKPiA+Cj4gPiAgCQkJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4 dChyZXEpOwo+ID4tCQkJaWYgKHJldCkgewo+ID4tCQkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2Vs KHJlcSk7Cj4gPi0JCQkJcmV0dXJuIHJldDsKPiA+LQkJCX0KPiA+LQo+ID4gIAkJCWk5MTVfYWRk X3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsKPiA+KwkJCWlmIChyZXQpCj4gPisJCQkJcmV0dXJuIHJl dDsKPiA+ICAJCX0KPiA+Cj4gPiAgCQlyZXQgPSBpbnRlbF9yaW5nX2lkbGUocmluZyk7Cj4gPmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKPiA+aW5kZXggODNhMDk3Yzk0OTEx Li41ZGE3YWRjM2Y3YjIgMTAwNjQ0Cj4gPi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYwo+ID4rKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMKPiA+QEAgLTY1Miw3ICs2NTIsNiBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKPiA+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKPiA+ICAJc3RydWN0IGludGVsX2Nv bnRleHQgKmZyb20gPSByaW5nLT5sYXN0X2NvbnRleHQ7Cj4gPiAgCXUzMiBod19mbGFncyA9IDA7 Cj4gPi0JYm9vbCB1bmluaXRpYWxpemVkID0gZmFsc2U7Cj4gPiAgCWludCByZXQsIGk7Cj4gPgo+ ID4gIAlpZiAoZnJvbSAhPSBOVUxMICYmIHJpbmcgPT0gJmRldl9wcml2LT5yaW5nW1JDU10pIHsK PiA+QEAgLTc1OSw2ICs3NTgsMTUgQEAgc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpCj4gPiAgCQkJdG8tPnJlbWFwX3NsaWNlICY9IH4oMTw8aSk7 Cj4gPiAgCX0KPiA+Cj4gPisJaWYgKCF0by0+bGVnYWN5X2h3X2N0eC5pbml0aWFsaXplZCkgewo+ ID4rCQlpZiAocmluZy0+aW5pdF9jb250ZXh0KSB7Cj4gPisJCQlyZXQgPSByaW5nLT5pbml0X2Nv bnRleHQocmVxKTsKPiA+KwkJCWlmIChyZXQpCj4gPisJCQkJZ290byB1bnBpbl9vdXQ7Cj4gPisJ CX0KPiA+KwkJdG8tPmxlZ2FjeV9od19jdHguaW5pdGlhbGl6ZWQgPSB0cnVlOwo+ID4rCX0KPiA+ Kwo+ID4gIAkvKiBUaGUgYmFja2luZyBvYmplY3QgZm9yIHRoZSBjb250ZXh0IGlzIGRvbmUgYWZ0 ZXIgc3dpdGNoaW5nIHRvIHRoZQo+ID4gIAkgKiAqbmV4dCogY29udGV4dC4gVGhlcmVmb3JlIHdl IGNhbm5vdCByZXRpcmUgdGhlIHByZXZpb3VzIGNvbnRleHQgdW50aWwKPiA+ICAJICogdGhlIG5l eHQgY29udGV4dCBoYXMgYWxyZWFkeSBzdGFydGVkIHJ1bm5pbmcuIEluIGZhY3QsIHRoZSBiZWxv dyBjb2RlCj4gPkBAIC03ODIsMjEgKzc5MCwxMCBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKPiA+ICAJCWk5MTVfZ2VtX2NvbnRleHRfdW5y ZWZlcmVuY2UoZnJvbSk7Cj4gPiAgCX0KPiA+Cj4gPi0JdW5pbml0aWFsaXplZCA9ICF0by0+bGVn YWN5X2h3X2N0eC5pbml0aWFsaXplZDsKPiA+LQl0by0+bGVnYWN5X2h3X2N0eC5pbml0aWFsaXpl ZCA9IHRydWU7Cj4gPi0KPiA+ICBkb25lOgo+ID4gIAlpOTE1X2dlbV9jb250ZXh0X3JlZmVyZW5j ZSh0byk7Cj4gPiAgCXJpbmctPmxhc3RfY29udGV4dCA9IHRvOwo+ID4KPiA+LQlpZiAodW5pbml0 aWFsaXplZCkgewo+ID4tCQlpZiAocmluZy0+aW5pdF9jb250ZXh0KSB7Cj4gPi0JCQlyZXQgPSBy aW5nLT5pbml0X2NvbnRleHQocmVxKTsKPiA+LQkJCWlmIChyZXQpCj4gPi0JCQkJRFJNX0VSUk9S KCJyaW5nIGluaXQgY29udGV4dDogJWRcbiIsIHJldCk7Cj4gPi0JCX0KPiA+LQl9Cj4gPi0KPiA+ ICAJcmV0dXJuIDA7Cj4gPgo+ID4gIHVucGluX291dDoKPiA+ZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwo+ID5pbmRleCA4ZmQwMGQyNzk0NDcuLjYxYmIxNTUwN2Iz MCAxMDA2NDQKPiA+LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCj4gPisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwo+ ID5AQCAtMTEzMyw3ICsxMTMzLDcgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2FjdGl2 ZShzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAo+ID4gIAl9Cj4gPiAgfQo+ID4KPiA+LXZvaWQKPiA+ K3N0YXRpYyB2b2lkCj4gPiAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMoc3Ry dWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKPiA+ICB7Cj4gPiAgCS8qIFVuY29u ZGl0aW9uYWxseSBmb3JjZSBhZGRfcmVxdWVzdCB0byBlbWl0IGEgZnVsbCBmbHVzaC4gKi8KPiA+ QEAgLTEzMTgsNyArMTMxOCw2IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1 Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAo+ID4gIAl0cmFjZV9pOTE1X2dlbV9y aW5nX2Rpc3BhdGNoKHBhcmFtcy0+cmVxdWVzdCwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7Cj4g Pgo+ID4gIAlpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fYWN0aXZlKHZtYXMsIHBhcmFtcy0+ cmVxdWVzdCk7Cj4gPi0JaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMocGFyYW1z KTsKPiAKPiBIbSB0aGlzIHdob2xlIGJsb2NrIGJsb2NrIGZyb20gdHJhY2VfLi4uIHRvCj4gaTkx NV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMgY291bGQgYmUgbW92ZWQgdG8gZG9fZXhl Y2J1ZmZlciBhcyBhbmQKPiBpbmRlcGVuZGVudCBjbGVhbnVwIHBhdGNoIGlmIHVuZGVyICJpZiAo cmV0ID09IDApIi4KPiAKPiBTbyB0aGUgY29uY2VybiBpcyB0aGF0IHNvbWV0aGluZyBoYXMgYmVl biB3cml0dGVuIHRvIHRoZSByaW5nYnVmZmVyIGJ1dCBub3QKPiBhbGwgb2YgaXQ/Cj4gCj4gV2h5 IGRvIHdlIGhhdmUgdG8gc3VibWl0IHRoYXQsIEkgYW0gYXNzdW1pbmcgd2hhdGV2ZXIgd2FzIHdy aXR0ZW4gaXMgbm90Cj4gaW50ZXJlc3RpbmcgdG8gYmUgZXhlY3V0ZWQgdW5sZXNzIHRoZSB3aG9s ZSBiYiB3ZW50IGluLgo+IAo+IFNvIGNvdWxkIHdlIGp1c3QgcmV3aW5kIHRoZSBwb2ludGVycz8g U3RvcmUgdGhlbSBhdCB0aGUgYmVnaW5uaW5nIGFuZCByZXdpbmQKPiBpZiBzb21ldGhpbmcgZmFp bGVkLgo+IAo+ID4KPiA+ICAJcmV0dXJuIDA7Cj4gPiAgfQo+ID5AQCAtMTYxNiw4ICsxNjE1LDEw IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAq ZGF0YSwKPiA+ICAJfQo+ID4KPiA+ICAJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hZGRfdG9fY2xp ZW50KHJlcSwgZmlsZSk7Cj4gPi0JaWYgKHJldCkKPiA+KwlpZiAocmV0KSB7Cj4gPisJCWk5MTVf Z2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Cj4gPiAgCQlnb3RvIGVycl9iYXRjaF91bnBpbjsKPiA+ Kwl9Cj4gCj4gRG9lc24ndCBsb29rIGxpa2UgdGhpcyBjYW4gZmFpbCBzbyBhIHNpZGUgY2xlYW51 cCBvbmx5Pwo+IAo+IFJlZ2FyZHMsCj4gCj4gVHZydGtvCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0 d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==