From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH v5 6/7] drm/i915: deduplicate intel_pin_and_map_ringbuffer_obj() error handling Date: Mon, 29 Feb 2016 12:10:02 +0000 Message-ID: <56D4351A.7000800@linux.intel.com> References: <1456744394-29831-1-git-send-email-david.s.gordon@intel.com> <1456744394-29831-7-git-send-email-david.s.gordon@intel.com> 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 ESMTP id B2C9D6E298 for ; Mon, 29 Feb 2016 12:10:03 +0000 (UTC) In-Reply-To: <1456744394-29831-7-git-send-email-david.s.gordon@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Gordon , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org CgpPbiAyOS8wMi8xNiAxMToxMywgRGF2ZSBHb3Jkb24gd3JvdGU6Cj4gRnJvbTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4KPiBSZXBsYWNlIG11bHRpcGxlICJ1bnBp bigpOyByZXR1cm4gZXJybm87IiBzZXF1ZW5jZXMgd2l0aAo+IGEgYnJhbmNoIHRvIGEgc2luZ2xl IGNvbW1vbiBsYWJlbCBmb3IgYWxsIHRoZSBlcnJvciBwYXRocy4KPgo+IEV4dHJhY3RlZCBmcm9t IENocmlzIFdpbHNvbidzIHBhdGNoOgo+ICAgICAgZHJtL2k5MTU6IFJlZmFjdG9yIGR1cGxpY2F0 ZSBvYmplY3Qgdm1hcCBmdW5jdGlvbnMKPiBpbiBwcmVwYXJhdGlvbiBmb3IgdGhlIHJlaW1wbGVt ZW50YXRpb24gb2YgdGhlIHNhbWUuCj4KPiBTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2 aWQucy5nb3Jkb25AaW50ZWwuY29tPgo+IENjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KPiBDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDI0 ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlv bnMoKyksIDEyIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYwo+IGluZGV4IDQzNGE0NTIuLjE1ZTJkMjkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCj4gQEAgLTIwNzcsMTYgKzIwNzcsMTQgQEAgaW50IGludGVs X3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gICAJ CQlyZXR1cm4gcmV0Owo+Cj4gICAJCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fY3B1X2Rv bWFpbihvYmosIHRydWUpOwo+IC0JCWlmIChyZXQpIHsKPiAtCQkJaTkxNV9nZW1fb2JqZWN0X2dn dHRfdW5waW4ob2JqKTsKPiAtCQkJcmV0dXJuIHJldDsKPiAtCQl9Cj4gKwkJaWYgKHJldCkKPiAr CQkJZ290byB1bnBpbjsKPgo+ICAgCQlyaW5nYnVmLT52aXJ0dWFsX3N0YXJ0ID0gaTkxNV9nZW1f b2JqZWN0X3ZtYXBfcmFuZ2Uob2JqLCAwLAo+ICAgCQkJCQkJcmluZ2J1Zi0+c2l6ZSA+PiBQQUdF X1NISUZUKTsKPiAgIAkJaWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCkgewo+IC0J CQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOwo+IC0JCQlyZXR1cm4gLUVOT01FTTsK PiArCQkJcmV0ID0gLUVOT01FTTsKPiArCQkJZ290byB1bnBpbjsKPiAgIAkJfQo+ICAgCX0gZWxz ZSB7Cj4gICAJCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihvYmosIFBBR0VfU0laRSwgUElO X01BUFBBQkxFKTsKPiBAQCAtMjA5NCwxMCArMjA5Miw4IEBAIGludCBpbnRlbF9waW5fYW5kX21h cF9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAgCQkJcmV0dXJuIHJl dDsKPgo+ICAgCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2d0dF9kb21haW4ob2JqLCB0 cnVlKTsKPiAtCQlpZiAocmV0KSB7Cj4gLQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9i aik7Cj4gLQkJCXJldHVybiByZXQ7Cj4gLQkJfQo+ICsJCWlmIChyZXQpCj4gKwkJCWdvdG8gdW5w aW47Cj4KPiAgIAkJLyogQWNjZXNzIHRocm91Z2ggdGhlIEdUVCByZXF1aXJlcyB0aGUgZGV2aWNl IHRvIGJlIGF3YWtlLiAqLwo+ICAgCQlhc3NlcnRfcnBtX3dha2Vsb2NrX2hlbGQoZGV2X3ByaXYp Owo+IEBAIC0yMTA1LDE0ICsyMTAxLDE4IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVm ZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAgCQlyaW5nYnVmLT52aXJ0dWFsX3N0 YXJ0ID0gaW9yZW1hcF93YyhkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlX2Jhc2UgKwo+ICAgCQkJCQkJ ICAgIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopLCByaW5nYnVmLT5zaXplKTsKPiAgIAkJ aWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCkgewo+IC0JCQlpOTE1X2dlbV9vYmpl Y3RfZ2d0dF91bnBpbihvYmopOwo+IC0JCQlyZXR1cm4gLUVJTlZBTDsKPiArCQkJcmV0ID0gLUVO T01FTTsKPiArCQkJZ290byB1bnBpbjsKPiAgIAkJfQo+ICAgCX0KPgo+ICAgCXJpbmdidWYtPnZt YSA9IGk5MTVfZ2VtX29ial90b19nZ3R0KG9iaik7Cj4KPiAgIAlyZXR1cm4gMDsKPiArCj4gK3Vu cGluOgo+ICsJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKPiArCXJldHVybiByZXQ7 Cj4gICB9Cj4KPiAgIHN0YXRpYyB2b2lkIGludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCj4KClJldmlld2VkLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgoKUmVnYXJkcywKClR2cnRrbwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==