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: Mon, 28 Sep 2015 18:25:04 +0300 Message-ID: <87612ua7n3.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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id B8D886E9F8 for ; Mon, 28 Sep 2015 08:25:39 -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 CkhpLAoKQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4g SGF2aW5nIGZsdXNoZWQgYWxsIHJlcXVlc3RzIGZyb20gYWxsIHF1ZXVlcywgd2Uga25vdyB0aGF0 IGFsbAo+IHJpbmdidWZmZXJzIG11c3Qgbm93IGJlIGVtcHR5LiBIb3dldmVyLCBzaW5jZSB3ZSBk byBub3QgcmVjbGFpbQo+IGFsbCBzcGFjZSB3aGVuIHJldGlyaW5nIHRoZSByZXF1ZXN0ICh0byBw cmV2ZW50IEhFQURzIGNvbGxpZGluZwo+IHdpdGggcmFwaWQgcmluZ2J1ZmZlciB3cmFwYXJvdW5k KSB0aGUgYW1vdW50IG9mIGF2YWlsYWJsZSBzcGFjZQo+IG9uIGVhY2ggcmluZ2J1ZmZlciB1cG9u IHJlc2V0IGlzIGxlc3MgdGhhbiB3aGVuIHdlIHN0YXJ0LiBEbyBvbmUKPiBtb3JlIHBhc3Mgb3Zl ciBhbGwgdGhlIHJpbmdidWZmZXJzIHRvIHJlc2V0IHRoZSBhdmFpbGFibGUgc3BhY2UKPgo+IFNp Z25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENj OiBBcnVuIFNpbHV2ZXJ5IDxhcnVuLnNpbHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4KPiBDYzogTWlr YSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Cj4gQ2M6IERhdmUgR29yZG9uIDxk YXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgICAgICAgICB8IDE0ICsrKysrKysrKysrKysrCj4gIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jICAgICAgICB8ICAxICsKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jIHwgMTMgKysrKysrKysrKy0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgMiArKwo+ICA0IGZpbGVzIGNoYW5nZWQsIDI3IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBpbmRl eCA0MTI2M2NkNDE3MGMuLjNhNDJjMzUwZmVjOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u Ywo+IEBAIC0yNzM4LDYgKzI3MzgsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZXNldF9yaW5n X3N0YXR1cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gIHN0YXRpYyB2b2lk IGk5MTVfZ2VtX3Jlc2V0X3JpbmdfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCj4gIAkJCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPiAgewo+ICsJc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKmJ1ZmZlcjsKPiArCj4gIAl3aGlsZSAoIWxpc3RfZW1wdHko JnJpbmctPmFjdGl2ZV9saXN0KSkgewo+ICAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv Ymo7Cj4gIAo+IEBAIC0yNzgzLDYgKzI3ODUsMTggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVz ZXRfcmluZ19jbGVhbnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgCj4g IAkJaTkxNV9nZW1fcmVxdWVzdF9yZXRpcmUocmVxdWVzdCk7Cj4gIAl9Cj4gKwo+ICsJLyogSGF2 aW5nIGZsdXNoZWQgYWxsIHJlcXVlc3RzIGZyb20gYWxsIHF1ZXVlcywgd2Uga25vdyB0aGF0IGFs bAo+ICsJICogcmluZ2J1ZmZlcnMgbXVzdCBub3cgYmUgZW1wdHkuIEhvd2V2ZXIsIHNpbmNlIHdl IGRvIG5vdCByZWNsYWltCj4gKwkgKiBhbGwgc3BhY2Ugd2hlbiByZXRpcmluZyB0aGUgcmVxdWVz dCAodG8gcHJldmVudCBIRUFEcyBjb2xsaWRpbmcKPiArCSAqIHdpdGggcmFwaWQgcmluZ2J1ZmZl ciB3cmFwYXJvdW5kKSB0aGUgYW1vdW50IG9mIGF2YWlsYWJsZSBzcGFjZQo+ICsJICogdXBvbiBy ZXNldCBpcyBsZXNzIHRoYW4gd2hlbiB3ZSBzdGFydC4gRG8gb25lIG1vcmUgcGFzcyBvdmVyCj4g KwkgKiBhbGwgdGhlIHJpbmdidWZmZXJzIHRvIHJlc2V0IGxhc3RfcmV0aXJlZF9oZWFkLgo+ICsJ ICovCj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGJ1ZmZlciwgJnJpbmctPmJ1ZmZlcnMsIGxpbmsp IHsKPiArCQlidWZmZXItPmxhc3RfcmV0aXJlZF9oZWFkID0gYnVmZmVyLT50YWlsOwo+ICsJCWlu dGVsX3JpbmdfdXBkYXRlX3NwYWNlKGJ1ZmZlcik7Cj4gKwl9Cj4gIH0KPiAgCgpBcyByaWdodCBh ZnRlciBjbGVhbmluZyB1cCB0aGUgcmluZ3MgaW4gaTkxNV9nZW1fcmVzZXQoKSwKd2UgaGF2ZSBp OTE1X2dlbV9jb250ZXh0X3Jlc2V0KCkuIFRoYXQgd2lsbCBnbyB0aHJvdWdoCmFsbCBjb250ZXh0 cyBhbmQgdGhlaXIgcmluZ2J1ZmZlcnMgYW5kIHNldCB0YWlsIGFuZCBoZWFkIHRvCnplcm8uCgpJ ZiB3ZSBkbyB0aGUgc3BhY2UgYWRqdXN0bWVudCBpbiBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KCks CndlIGNhbiBhdm9pZCBhZGRpbmcgbmV3IHJpbmctPmJ1ZmZlcnMgbGlzdCBmb3IgdGhpcyBwdXJw b3NlOgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMjU2MTY3Yi4uZTExMGQ2YiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTI1MzIsMTUgKzI1MzIsMTYgQEAgdm9pZCBpbnRl bF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlCipkZXYsCiAgICAgICAgICAgICAg ICAgICAgICAgIFdBUk4oMSwgIkZhaWxlZCBnZXRfcGFnZXMgZm9yIGNvbnRleHQgb2JqXG4iKTsK ICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgICAgIHJpbmdidWYtPmxhc3RfcmV0aXJlZF9oZWFkID0gcmluZ2J1Zi0+dGFpbDsK KyAgICAgICAgICAgICAgIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHJpbmdidWYpOworCiAgICAg ICAgICAgICAgICBwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosIExSQ19T VEFURV9QTik7CiAgICAgICAgICAgICAgICByZWdfc3RhdGUgPSBrbWFwX2F0b21pYyhwYWdlKTsK IAotICAgICAgICAgICAgICAgcmVnX3N0YXRlW0NUWF9SSU5HX0hFQUQrMV0gPSAwOwotICAgICAg ICAgICAgICAgcmVnX3N0YXRlW0NUWF9SSU5HX1RBSUwrMV0gPSAwOworICAgICAgICAgICAgICAg cmVnX3N0YXRlW0NUWF9SSU5HX0hFQUQrMV0gPSByaW5nYnVmLT5oZWFkOworICAgICAgICAgICAg ICAgcmVnX3N0YXRlW0NUWF9SSU5HX1RBSUwrMV0gPSByaW5nYnVmLT50YWlsOwogCiAgICAgICAg ICAgICAgICBrdW5tYXBfYXRvbWljKHJlZ19zdGF0ZSk7Ci0KLSAgICAgICAgICAgICAgIHJpbmdi dWYtPmhlYWQgPSAwOwotICAgICAgICAgICAgICAgcmluZ2J1Zi0+dGFpbCA9IDA7CiAgICAgICAg fQoKClRoYW5rcywKLS1NaWthCgo+ICB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBpbmRleCAyOGE3MTJlN2QyZDAu LmRlNTJkZGMxMDhhNyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gQEAgLTE4ODEs NiArMTg4MSw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluCj4gIAlpOTE1X2dlbV9iYXRjaF9w b29sX2luaXQoZGV2LCAmcmluZy0+YmF0Y2hfcG9vbCk7Cj4gIAlpbml0X3dhaXRxdWV1ZV9oZWFk KCZyaW5nLT5pcnFfcXVldWUpOwo+ICAKPiArCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5idWZmZXJz KTsKPiAgCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5leGVjbGlzdF9xdWV1ZSk7Cj4gIAlJTklUX0xJ U1RfSEVBRCgmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7Cj4gIAlzcGluX2xvY2tf aW5pdCgmcmluZy0+ZXhlY2xpc3RfbG9jayk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwo+IGluZGV4IDIwYTc1YmI1MTZhYy4uZDJlMGIzYjdlZmJmIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+ICsrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+IEBAIC0yMDMwLDEwICsyMDMwLDE0 IEBAIGludGVsX2VuZ2luZV9jcmVhdGVfcmluZ2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUsIGludCBzaXplKQo+ICAJaW50IHJldDsKPiAgCj4gIAlyaW5nID0ga3phbGxvYyhz aXplb2YoKnJpbmcpLCBHRlBfS0VSTkVMKTsKPiAtCWlmIChyaW5nID09IE5VTEwpCj4gKwlpZiAo cmluZyA9PSBOVUxMKSB7Cj4gKwkJRFJNX0RFQlVHX0RSSVZFUigiRmFpbGVkIHRvIGFsbG9jYXRl IHJpbmdidWZmZXIgJXNcbiIsCj4gKwkJCQkgZW5naW5lLT5uYW1lKTsKPiAgCQlyZXR1cm4gRVJS X1BUUigtRU5PTUVNKTsKPiArCX0KPiAgCj4gIAlyaW5nLT5yaW5nID0gZW5naW5lOwo+ICsJbGlz dF9hZGQoJnJpbmctPmxpbmssICZlbmdpbmUtPmJ1ZmZlcnMpOwo+ICAKPiAgCXJpbmctPnNpemUg PSBzaXplOwo+ICAJLyogV29ya2Fyb3VuZCBhbiBlcnJhdHVtIG9uIHRoZSBpODMwIHdoaWNoIGNh dXNlcyBhIGhhbmcgaWYKPiBAQCAtMjA0OSw4ICsyMDUzLDkgQEAgaW50ZWxfZW5naW5lX2NyZWF0 ZV9yaW5nYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgaW50IHNpemUpCj4g IAo+ICAJcmV0ID0gaW50ZWxfYWxsb2NfcmluZ2J1ZmZlcl9vYmooZW5naW5lLT5kZXYsIHJpbmcp Owo+ICAJaWYgKHJldCkgewo+IC0JCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIHJpbmdi dWZmZXIgJXM6ICVkXG4iLAo+IC0JCQkgIGVuZ2luZS0+bmFtZSwgcmV0KTsKPiArCQlEUk1fREVC VUdfRFJJVkVSKCJGYWlsZWQgdG8gYWxsb2NhdGUgcmluZ2J1ZmZlciAlczogJWRcbiIsCj4gKwkJ CQkgZW5naW5lLT5uYW1lLCByZXQpOwo+ICsJCWxpc3RfZGVsKCZyaW5nLT5saW5rKTsKPiAgCQlr ZnJlZShyaW5nKTsKPiAgCQlyZXR1cm4gRVJSX1BUUihyZXQpOwo+ICAJfQo+IEBAIC0yMDYyLDYg KzIwNjcsNyBAQCB2b2lkCj4gIGludGVsX3JpbmdidWZmZXJfZnJlZShzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZykKPiAgewo+ICAJaW50ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihyaW5n KTsKPiArCWxpc3RfZGVsKCZyaW5nLT5saW5rKTsKPiAgCWtmcmVlKHJpbmcpOwo+ICB9Cj4gIAo+ IEBAIC0yMDc3LDYgKzIwODMsNyBAQCBzdGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5hY3RpdmVf bGlzdCk7Cj4gIAlJTklUX0xJU1RfSEVBRCgmcmluZy0+cmVxdWVzdF9saXN0KTsKPiAgCUlOSVRf TElTVF9IRUFEKCZyaW5nLT5leGVjbGlzdF9xdWV1ZSk7Cj4gKwlJTklUX0xJU1RfSEVBRCgmcmlu Zy0+YnVmZmVycyk7Cj4gIAlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoZGV2LCAmcmluZy0+YmF0 Y2hfcG9vbCk7Cj4gIAltZW1zZXQocmluZy0+c2VtYXBob3JlLnN5bmNfc2Vxbm8sIDAsIHNpemVv ZihyaW5nLT5zZW1hcGhvcmUuc3luY19zZXFubykpOwo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCj4gaW5kZXggNDlmYTQxZGMwZWI2Li41OGIxOTc2YTdkMGEgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCj4gQEAgLTEwMCw2ICsx MDAsNyBAQCBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciB7Cj4gIAl2b2lkIF9faW9tZW0gKnZpcnR1 YWxfc3RhcnQ7Cj4gIAo+ICAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKPiArCXN0cnVj dCBsaXN0X2hlYWQgbGluazsKPiAgCj4gIAl1MzIgaGVhZDsKPiAgCXUzMiB0YWlsOwo+IEBAIC0x NTcsNiArMTU4LDcgQEAgc3RydWN0ICBpbnRlbF9lbmdpbmVfY3Mgewo+ICAJdTMyCQltbWlvX2Jh c2U7Cj4gIAlzdHJ1Y3QJCWRybV9kZXZpY2UgKmRldjsKPiAgCXN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpidWZmZXI7Cj4gKwlzdHJ1Y3QgbGlzdF9oZWFkIGJ1ZmZlcnM7Cj4gIAo+ICAJLyoKPiAg CSAqIEEgcG9vbCBvZiBvYmplY3RzIHRvIHVzZSBhcyBzaGFkb3cgY29waWVzIG9mIGNsaWVudCBi YXRjaCBidWZmZXJzCj4gLS0gCj4gMi41LjEKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK