From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 2/2] drm/i915: Recover all available ringbuffer space following reset Date: Fri, 23 Oct 2015 14:07:35 +0300 Message-ID: <87k2qdyhag.fsf@gaia.fi.intel.com> References: <1441281700-17814-1-git-send-email-chris@chris-wilson.co.uk> <1441281700-17814-2-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CAD66EFBD for ; Fri, 23 Oct 2015 04:08:51 -0700 (PDT) In-Reply-To: <1441281700-17814-2-git-send-email-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 Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gSGF2aW5n IGZsdXNoZWQgYWxsIHJlcXVlc3RzIGZyb20gYWxsIHF1ZXVlcywgd2Uga25vdyB0aGF0IGFsbAo+ IHJpbmdidWZmZXJzIG11c3Qgbm93IGJlIGVtcHR5LiBIb3dldmVyLCBzaW5jZSB3ZSBkbyBub3Qg cmVjbGFpbQo+IGFsbCBzcGFjZSB3aGVuIHJldGlyaW5nIHRoZSByZXF1ZXN0ICh0byBwcmV2ZW50 IEhFQURzIGNvbGxpZGluZwo+IHdpdGggcmFwaWQgcmluZ2J1ZmZlciB3cmFwYXJvdW5kKSB0aGUg YW1vdW50IG9mIGF2YWlsYWJsZSBzcGFjZQo+IG9uIGVhY2ggcmluZ2J1ZmZlciB1cG9uIHJlc2V0 IGlzIGxlc3MgdGhhbiB3aGVuIHdlIHN0YXJ0LiBEbyBvbmUKPiBtb3JlIHBhc3Mgb3ZlciBhbGwg dGhlIHJpbmdidWZmZXJzIHRvIHJlc2V0IHRoZSBhdmFpbGFibGUgc3BhY2UKPgo+IFNpZ25lZC1v ZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBBcnVu IFNpbHV2ZXJ5IDxhcnVuLnNpbHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4KPiBDYzogTWlrYSBLdW9w cGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Cj4gQ2M6IERhdmUgR29yZG9uIDxkYXZpZC5z LmdvcmRvbkBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgICAgICAgICB8IDE0ICsrKysrKysrKysrKysrCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgICAgICB8ICAxICsKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIHwgMTMgKysrKysrKysrKy0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmggfCAgMiArKwo+ICA0IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMo KyksIDMgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBpbmRleCA0MTI2 M2NkNDE3MGMuLjNhNDJjMzUwZmVjOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IEBA IC0yNzM4LDYgKzI3MzgsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZXNldF9yaW5nX3N0YXR1 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gIHN0YXRpYyB2b2lkIGk5MTVf Z2VtX3Jlc2V0X3JpbmdfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs Cj4gIAkJCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPiAgewo+ICsJc3RydWN0IGlu dGVsX3JpbmdidWZmZXIgKmJ1ZmZlcjsKPiArCj4gIAl3aGlsZSAoIWxpc3RfZW1wdHkoJnJpbmct PmFjdGl2ZV9saXN0KSkgewo+ICAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7Cj4g IAo+IEBAIC0yNzgzLDYgKzI3ODUsMTggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfcmlu Z19jbGVhbnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgCj4gIAkJaTkx NV9nZW1fcmVxdWVzdF9yZXRpcmUocmVxdWVzdCk7Cj4gIAl9Cj4gKwo+ICsJLyogSGF2aW5nIGZs dXNoZWQgYWxsIHJlcXVlc3RzIGZyb20gYWxsIHF1ZXVlcywgd2Uga25vdyB0aGF0IGFsbAo+ICsJ ICogcmluZ2J1ZmZlcnMgbXVzdCBub3cgYmUgZW1wdHkuIEhvd2V2ZXIsIHNpbmNlIHdlIGRvIG5v dCByZWNsYWltCj4gKwkgKiBhbGwgc3BhY2Ugd2hlbiByZXRpcmluZyB0aGUgcmVxdWVzdCAodG8g cHJldmVudCBIRUFEcyBjb2xsaWRpbmcKPiArCSAqIHdpdGggcmFwaWQgcmluZ2J1ZmZlciB3cmFw YXJvdW5kKSB0aGUgYW1vdW50IG9mIGF2YWlsYWJsZSBzcGFjZQo+ICsJICogdXBvbiByZXNldCBp cyBsZXNzIHRoYW4gd2hlbiB3ZSBzdGFydC4gRG8gb25lIG1vcmUgcGFzcyBvdmVyCj4gKwkgKiBh bGwgdGhlIHJpbmdidWZmZXJzIHRvIHJlc2V0IGxhc3RfcmV0aXJlZF9oZWFkLgo+ICsJICovCj4g KwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGJ1ZmZlciwgJnJpbmctPmJ1ZmZlcnMsIGxpbmspIHsKPiAr CQlidWZmZXItPmxhc3RfcmV0aXJlZF9oZWFkID0gYnVmZmVyLT50YWlsOwo+ICsJCWludGVsX3Jp bmdfdXBkYXRlX3NwYWNlKGJ1ZmZlcik7Cj4gKwl9CgpUaGlzIGlzIGFsbCBpbiB2YWluIGFzIHRo ZSBpOTE1X2dlbV9jb250ZXh0X3Jlc2V0KCkgLT4KaW50ZWxfbHJfY29udGV4dF9yZXNldCBzdGls bCBzZXRzIGhlYWQgYW5kIHRhaWwgdG8gemVyby4KClNvIHlvdXIgbGFzdF9yZXRpcmVkX2hlYWQg d2lsbCBzdGlsbCBkYW5nbGUgaW4gYSBwcmUtcmVzZXQKd29ybGQgd2hlbiB0aGUgcmVzdCBvZiB0 aGUgcmluZ2J1ZiBpdGVtcyB3aWxsIGJlIHNldCB0byBwb3N0CnJlc2V0IHdvcmxkLgoKCi1NaWth CgoKPiAgfQo+ICAKPiAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gaW5kZXggMjhhNzEyZTdkMmQwLi5kZTUyZGRj MTA4YTcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+IEBAIC0xODgxLDYgKzE4ODEs NyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbgo+ICAJaTkxNV9nZW1fYmF0Y2hfcG9vbF9pbml0 KGRldiwgJnJpbmctPmJhdGNoX3Bvb2wpOwo+ICAJaW5pdF93YWl0cXVldWVfaGVhZCgmcmluZy0+ aXJxX3F1ZXVlKTsKPiAgCj4gKwlJTklUX0xJU1RfSEVBRCgmcmluZy0+YnVmZmVycyk7Cj4gIAlJ TklUX0xJU1RfSEVBRCgmcmluZy0+ZXhlY2xpc3RfcXVldWUpOwo+ICAJSU5JVF9MSVNUX0hFQUQo JnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QpOwo+ICAJc3Bpbl9sb2NrX2luaXQoJnJp bmctPmV4ZWNsaXN0X2xvY2spOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmMKPiBpbmRleCAyMGE3NWJiNTE2YWMuLmQyZTBiM2I3ZWZiZiAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKPiBAQCAtMjAzMCwxMCArMjAzMCwxNCBAQCBpbnRl bF9lbmdpbmVfY3JlYXRlX3JpbmdidWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LCBpbnQgc2l6ZSkKPiAgCWludCByZXQ7Cj4gIAo+ICAJcmluZyA9IGt6YWxsb2Moc2l6ZW9mKCpy aW5nKSwgR0ZQX0tFUk5FTCk7Cj4gLQlpZiAocmluZyA9PSBOVUxMKQo+ICsJaWYgKHJpbmcgPT0g TlVMTCkgewo+ICsJCURSTV9ERUJVR19EUklWRVIoIkZhaWxlZCB0byBhbGxvY2F0ZSByaW5nYnVm ZmVyICVzXG4iLAo+ICsJCQkJIGVuZ2luZS0+bmFtZSk7Cj4gIAkJcmV0dXJuIEVSUl9QVFIoLUVO T01FTSk7Cj4gKwl9Cj4gIAo+ICAJcmluZy0+cmluZyA9IGVuZ2luZTsKPiArCWxpc3RfYWRkKCZy aW5nLT5saW5rLCAmZW5naW5lLT5idWZmZXJzKTsKPiAgCj4gIAlyaW5nLT5zaXplID0gc2l6ZTsK PiAgCS8qIFdvcmthcm91bmQgYW4gZXJyYXR1bSBvbiB0aGUgaTgzMCB3aGljaCBjYXVzZXMgYSBo YW5nIGlmCj4gQEAgLTIwNDksOCArMjA1Myw5IEBAIGludGVsX2VuZ2luZV9jcmVhdGVfcmluZ2J1 ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKQo+ICAKPiAgCXJl dCA9IGludGVsX2FsbG9jX3JpbmdidWZmZXJfb2JqKGVuZ2luZS0+ZGV2LCByaW5nKTsKPiAgCWlm IChyZXQpIHsKPiAtCQlEUk1fRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSByaW5nYnVmZmVyICVz OiAlZFxuIiwKPiAtCQkJICBlbmdpbmUtPm5hbWUsIHJldCk7Cj4gKwkJRFJNX0RFQlVHX0RSSVZF UigiRmFpbGVkIHRvIGFsbG9jYXRlIHJpbmdidWZmZXIgJXM6ICVkXG4iLAo+ICsJCQkJIGVuZ2lu ZS0+bmFtZSwgcmV0KTsKPiArCQlsaXN0X2RlbCgmcmluZy0+bGluayk7Cj4gIAkJa2ZyZWUocmlu Zyk7Cj4gIAkJcmV0dXJuIEVSUl9QVFIocmV0KTsKPiAgCX0KPiBAQCAtMjA2Miw2ICsyMDY3LDcg QEAgdm9pZAo+ICBpbnRlbF9yaW5nYnVmZmVyX2ZyZWUoc3RydWN0IGludGVsX3JpbmdidWZmZXIg KnJpbmcpCj4gIHsKPiAgCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoocmluZyk7Cj4gKwls aXN0X2RlbCgmcmluZy0+bGluayk7Cj4gIAlrZnJlZShyaW5nKTsKPiAgfQo+ICAKPiBAQCAtMjA3 Nyw2ICsyMDgzLDcgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCj4gIAlJTklUX0xJU1RfSEVBRCgmcmluZy0+YWN0aXZlX2xpc3QpOwo+ ICAJSU5JVF9MSVNUX0hFQUQoJnJpbmctPnJlcXVlc3RfbGlzdCk7Cj4gIAlJTklUX0xJU1RfSEVB RCgmcmluZy0+ZXhlY2xpc3RfcXVldWUpOwo+ICsJSU5JVF9MSVNUX0hFQUQoJnJpbmctPmJ1ZmZl cnMpOwo+ICAJaTkxNV9nZW1fYmF0Y2hfcG9vbF9pbml0KGRldiwgJnJpbmctPmJhdGNoX3Bvb2wp Owo+ICAJbWVtc2V0KHJpbmctPnNlbWFwaG9yZS5zeW5jX3NlcW5vLCAwLCBzaXplb2YocmluZy0+ c2VtYXBob3JlLnN5bmNfc2Vxbm8pKTsKPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaAo+IGluZGV4IDQ5ZmE0MWRjMGViNi4uNThiMTk3NmE3ZDBhIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAo+ICsrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAo+IEBAIC0xMDAsNiArMTAwLDcgQEAg c3RydWN0IGludGVsX3JpbmdidWZmZXIgewo+ICAJdm9pZCBfX2lvbWVtICp2aXJ0dWFsX3N0YXJ0 Owo+ICAKPiAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Cj4gKwlzdHJ1Y3QgbGlzdF9o ZWFkIGxpbms7Cj4gIAo+ICAJdTMyIGhlYWQ7Cj4gIAl1MzIgdGFpbDsKPiBAQCAtMTU3LDYgKzE1 OCw3IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKPiAgCXUzMgkJbW1pb19iYXNlOwo+ICAJ c3RydWN0CQlkcm1fZGV2aWNlICpkZXY7Cj4gIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqYnVm ZmVyOwo+ICsJc3RydWN0IGxpc3RfaGVhZCBidWZmZXJzOwo+ICAKPiAgCS8qCj4gIAkgKiBBIHBv b2wgb2Ygb2JqZWN0cyB0byB1c2UgYXMgc2hhZG93IGNvcGllcyBvZiBjbGllbnQgYmF0Y2ggYnVm ZmVycwo+IC0tIAo+IDIuNS4xCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==