From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH v3] drm/i915: Handle incomplete Z_FINISH for compressed error states Date: Wed, 3 Oct 2018 10:04:04 +0100 Message-ID: References: <20181001194447.29910-2-chris@chris-wilson.co.uk> <20181003082422.23214-1-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 93E346E251 for ; Wed, 3 Oct 2018 09:04:09 +0000 (UTC) In-Reply-To: <20181003082422.23214-1-chris@chris-wilson.co.uk> Content-Language: en-GB 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: stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDAzLzEwLzIwMTggMDk6MjQsIENocmlzIFdpbHNvbiB3cm90ZToKPiBUaGUgZmluYWwgY2Fs bCB0byB6bGliX2RlZmxhdGUoWl9GSU5JU0gpIG1heSByZXF1aXJlIG1vcmUgb3V0cHV0Cj4gc3Bh Y2UgdG8gYmUgYWxsb2NhdGVkIGFuZCBzbyBuZWVkcyB0byByZS1pbnZva2VkLiBGYWlsdXJlIHRv IGRvIHNvIGluCj4gdGhlIGN1cnJlbnQgY29kZSBsZWFkcyB0byBpbmNvbXBsZXRlIHpsaWIgc3Ry ZWFtcyAoYWxiZWl0IGludGFjdCBkdWUgdG8KPiB0aGUgdXNlIG9mIFpfU1lOQ19GTFVTSCkgcmVz dWx0aW5nIGluIHRoZSBvY2Nhc2lvbmFsIHNob3J0IG9iamVjdAo+IGNhcHR1cmUuCj4gCj4gdjI6 IENoZWNrIGFnYWluc3Qgb3ZlcnJ1bm5pbmcgb3VyIHByZS1hbGxvY2F0ZWQgcGFnZSBhcnJheQo+ IHYzOiBEcm9wIFpfU1lOQ19GTFVTSCBlbnRpcmVseQo+IAo+IFRlc3RjYXNlOiBpZ3QvaTkxNS1l cnJvci1jYXB0dXJlLmpzCj4gRml4ZXM6IDBhOTcwMTVkNDVlZSAoImRybS9pOTE1OiBDb21wcmVz cyBHUFUgb2JqZWN0cyBpbiBlcnJvciBzdGF0ZSIpCj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9v bmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KPiBDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5v cmc+ICMgdjQuMTArCj4gQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgODgg KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dwdV9lcnJvci5oIHwgIDEgKwo+ICAgMiBmaWxlcyBjaGFuZ2VkLCA2NCBpbnNlcnRpb25zKCsp LCAyNSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMK PiBpbmRleCAzZDU1NTRmMTRkZmQuLjcwNWZmMTIyMTAwZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ncHVfZXJyb3IuYwo+IEBAIC0yMzIsNiArMjMyLDIwIEBAIHN0YXRpYyBib29sIGNv bXByZXNzX2luaXQoc3RydWN0IGNvbXByZXNzICpjKQo+ICAgCXJldHVybiB0cnVlOwo+ICAgfQo+ ICAgCj4gK3N0YXRpYyB2b2lkICpjb21wcmVzc19uZXh0X3BhZ2Uoc3RydWN0IGRybV9pOTE1X2Vy cm9yX29iamVjdCAqZHN0KQo+ICt7Cj4gKwl1bnNpZ25lZCBsb25nIHBhZ2U7Cj4gKwo+ICsJaWYg KGRzdC0+cGFnZV9jb3VudCA+PSBkc3QtPm51bV9wYWdlcykKPiArCQlyZXR1cm4gRVJSX1BUUigt RU5PU1BDKTsKPiArCj4gKwlwYWdlID0gX19nZXRfZnJlZV9wYWdlKEdGUF9BVE9NSUMgfCBfX0dG UF9OT1dBUk4pOwo+ICsJaWYgKCFwYWdlKQo+ICsJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwo+ ICsKPiArCXJldHVybiBkc3QtPnBhZ2VzW2RzdC0+cGFnZV9jb3VudCsrXSA9ICh2b2lkICopcGFn ZTsKPiArfQo+ICsKPiAgIHN0YXRpYyBpbnQgY29tcHJlc3NfcGFnZShzdHJ1Y3QgY29tcHJlc3Mg KmMsCj4gICAJCQkgdm9pZCAqc3JjLAo+ICAgCQkJIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmpl Y3QgKmRzdCkKPiBAQCAtMjQ1LDE5ICsyNTksMTQgQEAgc3RhdGljIGludCBjb21wcmVzc19wYWdl KHN0cnVjdCBjb21wcmVzcyAqYywKPiAgIAo+ICAgCWRvIHsKPiAgIAkJaWYgKHpzdHJlYW0tPmF2 YWlsX291dCA9PSAwKSB7Cj4gLQkJCXVuc2lnbmVkIGxvbmcgcGFnZTsKPiAtCj4gLQkJCXBhZ2Ug PSBfX2dldF9mcmVlX3BhZ2UoR0ZQX0FUT01JQyB8IF9fR0ZQX05PV0FSTik7Cj4gLQkJCWlmICgh cGFnZSkKPiAtCQkJCXJldHVybiAtRU5PTUVNOwo+ICsJCQl6c3RyZWFtLT5uZXh0X291dCA9IGNv bXByZXNzX25leHRfcGFnZShkc3QpOwo+ICsJCQlpZiAoSVNfRVJSKHpzdHJlYW0tPm5leHRfb3V0 KSkKPiArCQkJCXJldHVybiBQVFJfRVJSKHpzdHJlYW0tPm5leHRfb3V0KTsKPiAgIAo+IC0JCQlk c3QtPnBhZ2VzW2RzdC0+cGFnZV9jb3VudCsrXSA9ICh2b2lkICopcGFnZTsKPiAtCj4gLQkJCXpz dHJlYW0tPm5leHRfb3V0ID0gKHZvaWQgKilwYWdlOwo+ICAgCQkJenN0cmVhbS0+YXZhaWxfb3V0 ID0gUEFHRV9TSVpFOwo+ICAgCQl9Cj4gICAKPiAtCQlpZiAoemxpYl9kZWZsYXRlKHpzdHJlYW0s IFpfU1lOQ19GTFVTSCkgIT0gWl9PSykKPiArCQlpZiAoemxpYl9kZWZsYXRlKHpzdHJlYW0sIFpf Tk9fRkxVU0gpICE9IFpfT0spCj4gICAJCQlyZXR1cm4gLUVJTzsKPiAgIAl9IHdoaWxlICh6c3Ry ZWFtLT5hdmFpbF9pbik7Cj4gICAKPiBAQCAtMjY4LDE5ICsyNzcsNDIgQEAgc3RhdGljIGludCBj b21wcmVzc19wYWdlKHN0cnVjdCBjb21wcmVzcyAqYywKPiAgIAlyZXR1cm4gMDsKPiAgIH0KPiAg IAo+IC1zdGF0aWMgdm9pZCBjb21wcmVzc19maW5pKHN0cnVjdCBjb21wcmVzcyAqYywKPiArc3Rh dGljIGludCBjb21wcmVzc19mbHVzaChzdHJ1Y3QgY29tcHJlc3MgKmMsCj4gICAJCQkgIHN0cnVj dCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKmRzdCkKPiAgIHsKPiAgIAlzdHJ1Y3Qgel9zdHJlYW1f cyAqenN0cmVhbSA9ICZjLT56c3RyZWFtOwo+ICAgCj4gLQlpZiAoZHN0KSB7Cj4gLQkJemxpYl9k ZWZsYXRlKHpzdHJlYW0sIFpfRklOSVNIKTsKPiAtCQlkc3QtPnVudXNlZCA9IHpzdHJlYW0tPmF2 YWlsX291dDsKPiAtCX0KPiArCWRvIHsKPiArCQlzd2l0Y2ggKHpsaWJfZGVmbGF0ZSh6c3RyZWFt LCBaX0ZJTklTSCkpIHsKPiArCQljYXNlIFpfT0s6IC8qIG1vcmUgc3BhY2UgcmVxdWVzdGVkICov Cj4gKwkJCXpzdHJlYW0tPm5leHRfb3V0ID0gY29tcHJlc3NfbmV4dF9wYWdlKGRzdCk7Cj4gKwkJ CWlmIChJU19FUlIoenN0cmVhbS0+bmV4dF9vdXQpKQo+ICsJCQkJcmV0dXJuIFBUUl9FUlIoenN0 cmVhbS0+bmV4dF9vdXQpOwo+ICsKPiArCQkJenN0cmVhbS0+YXZhaWxfb3V0ID0gUEFHRV9TSVpF Owo+ICsJCQlicmVhazsKPiArCj4gKwkJY2FzZSBaX1NUUkVBTV9FTkQ6Cj4gKwkJCWdvdG8gZW5k Owo+ICsKPiArCQlkZWZhdWx0OiAvKiBhbnkgZXJyb3IgKi8KPiArCQkJcmV0dXJuIC1FSU87Cj4g KwkJfQo+ICsJfSB3aGlsZSAoMSk7Cj4gKwo+ICtlbmQ6Cj4gKwltZW1zZXQoenN0cmVhbS0+bmV4 dF9vdXQsIDAsIHpzdHJlYW0tPmF2YWlsX291dCk7Cj4gKwlkc3QtPnVudXNlZCA9IHpzdHJlYW0t PmF2YWlsX291dDsKPiArCXJldHVybiAwOwo+ICt9Cj4gKwo+ICtzdGF0aWMgdm9pZCBjb21wcmVz c19maW5pKHN0cnVjdCBjb21wcmVzcyAqYywKPiArCQkJICBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jf b2JqZWN0ICpkc3QpCj4gK3sKPiArCXN0cnVjdCB6X3N0cmVhbV9zICp6c3RyZWFtID0gJmMtPnpz dHJlYW07Cj4gICAKPiAgIAl6bGliX2RlZmxhdGVFbmQoenN0cmVhbSk7Cj4gICAJa2ZyZWUoenN0 cmVhbS0+d29ya3NwYWNlKTsKPiAtCj4gICAJaWYgKGMtPnRtcCkKPiAgIAkJZnJlZV9wYWdlKCh1 bnNpZ25lZCBsb25nKWMtPnRtcCk7Cj4gICB9Cj4gQEAgLTMxOSw2ICszNTEsMTIgQEAgc3RhdGlj IGludCBjb21wcmVzc19wYWdlKHN0cnVjdCBjb21wcmVzcyAqYywKPiAgIAlyZXR1cm4gMDsKPiAg IH0KPiAgIAo+ICtzdGF0aWMgaW50IGNvbXByZXNzX2ZsdXNoKHN0cnVjdCBjb21wcmVzcyAqYywK PiArCQkJICBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfb2JqZWN0ICpkc3QpCj4gK3sKPiArCXJldHVy biAwOwo+ICt9Cj4gKwo+ICAgc3RhdGljIHZvaWQgY29tcHJlc3NfZmluaShzdHJ1Y3QgY29tcHJl c3MgKmMsCj4gICAJCQkgIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKmRzdCkKPiAgIHsK PiBAQCAtOTE3LDYgKzk1NSw3IEBAIGk5MTVfZXJyb3Jfb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSwKPiAgIAl1bnNpZ25lZCBsb25nIG51bV9wYWdlczsKPiAgIAlz dHJ1Y3Qgc2d0X2l0ZXIgaXRlcjsKPiAgIAlkbWFfYWRkcl90IGRtYTsKPiArCWludCByZXQ7Cj4g ICAKPiAgIAlpZiAoIXZtYSkKPiAgIAkJcmV0dXJuIE5VTEw7Cj4gQEAgLTkzMCw2ICs5NjksNyBA QCBpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUs Cj4gICAKPiAgIAlkc3QtPmd0dF9vZmZzZXQgPSB2bWEtPm5vZGUuc3RhcnQ7Cj4gICAJZHN0LT5n dHRfc2l6ZSA9IHZtYS0+bm9kZS5zaXplOwo+ICsJZHN0LT5udW1fcGFnZXMgPSBudW1fcGFnZXM7 Cj4gICAJZHN0LT5wYWdlX2NvdW50ID0gMDsKPiAgIAlkc3QtPnVudXNlZCA9IDA7Cj4gICAKPiBA QCAtOTM4LDI4ICs5NzgsMjYgQEAgaTkxNV9lcnJvcl9vYmplY3RfY3JlYXRlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1LAo+ICAgCQlyZXR1cm4gTlVMTDsKPiAgIAl9Cj4gICAKPiArCXJl dCA9IC1FSU5WQUw7Cj4gICAJZm9yX2VhY2hfc2d0X2RtYShkbWEsIGl0ZXIsIHZtYS0+cGFnZXMp ICA+ICAgCQl2b2lkIF9faW9tZW0gKnM7Cj4gLQkJaW50IHJldDsKPiAgIAo+ICAgCQlnZ3R0LT52 bS5pbnNlcnRfcGFnZSgmZ2d0dC0+dm0sIGRtYSwgc2xvdCwgSTkxNV9DQUNIRV9OT05FLCAwKTsK PiAgIAo+ICAgCQlzID0gaW9fbWFwcGluZ19tYXBfYXRvbWljX3djKCZnZ3R0LT5pb21hcCwgc2xv dCk7Cj4gICAJCXJldCA9IGNvbXByZXNzX3BhZ2UoJmNvbXByZXNzLCAodm9pZCAgX19mb3JjZSAq KXMsIGRzdCk7Cj4gICAJCWlvX21hcHBpbmdfdW5tYXBfYXRvbWljKHMpOwo+IC0KPiAgIAkJaWYg KHJldCkKPiAtCQkJZ290byB1bndpbmQ7Cj4gKwkJCWJyZWFrOwo+ICAgCX0KPiAtCWdvdG8gb3V0 Owo+ICAgCj4gLXVud2luZDoKPiAtCXdoaWxlIChkc3QtPnBhZ2VfY291bnQtLSkKPiAtCQlmcmVl X3BhZ2UoKHVuc2lnbmVkIGxvbmcpZHN0LT5wYWdlc1tkc3QtPnBhZ2VfY291bnRdKTsKPiAtCWtm cmVlKGRzdCk7Cj4gLQlkc3QgPSBOVUxMOwo+ICsJaWYgKHJldCB8fCBjb21wcmVzc19mbHVzaCgm Y29tcHJlc3MsIGRzdCkpIHsKPiArCQl3aGlsZSAoZHN0LT5wYWdlX2NvdW50LS0pCj4gKwkJCWZy ZWVfcGFnZSgodW5zaWduZWQgbG9uZylkc3QtPnBhZ2VzW2RzdC0+cGFnZV9jb3VudF0pOwo+ICsJ CWtmcmVlKGRzdCk7Cj4gKwkJZHN0ID0gTlVMTDsKPiArCX0KPiAgIAo+IC1vdXQ6Cj4gICAJY29t cHJlc3NfZmluaSgmY29tcHJlc3MsIGRzdCk7Cj4gICAJZ2d0dC0+dm0uY2xlYXJfcmFuZ2UoJmdn dHQtPnZtLCBzbG90LCBQQUdFX1NJWkUpOwo+ICAgCXJldHVybiBkc3Q7Cj4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dwdV9lcnJvci5oCj4gaW5kZXggZjg5M2E0ZThiNzgzLi44NzEwZmIxOGVkNzQg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaAo+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmgKPiBAQCAtMTM1LDYgKzEz NSw3IEBAIHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSB7Cj4gICAJCXN0cnVjdCBkcm1faTkxNV9lcnJv cl9vYmplY3Qgewo+ICAgCQkJdTY0IGd0dF9vZmZzZXQ7Cj4gICAJCQl1NjQgZ3R0X3NpemU7Cj4g KwkJCWludCBudW1fcGFnZXM7Cj4gICAJCQlpbnQgcGFnZV9jb3VudDsKPiAgIAkJCWludCB1bnVz ZWQ7Cj4gICAJCQl1MzIgKnBhZ2VzWzBdOwo+IAoKUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CgpSZWdhcmRzLAoKVHZydGtvCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=