From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 2/6] drm/i915: Consolidate common error handling in intel_pin_and_map_ringbuffer_obj Date: Wed, 6 Apr 2016 10:02:48 +0100 Message-ID: <5704D0B8.9010408@linux.intel.com> References: <1459861057-25931-1-git-send-email-chris@chris-wilson.co.uk> <1459861057-25931-3-git-send-email-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 139036E8A2 for ; Wed, 6 Apr 2016 09:02:51 +0000 (UTC) In-Reply-To: <1459861057-25931-3-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 Ck9uIDA1LzA0LzE2IDEzOjU3LCBDaHJpcyBXaWxzb24gd3JvdGU6Cj4gQWZ0ZXIgd2UgcGluIHRo ZSByaW5nYnVmZmVyIGludG8gdGhlIEdHVFQsIGFsbCBlcnJvciBwYXRocyBuZWVkIHRvIHVucGlu Cj4gaXQgYWdhaW4uIE1vdmUgdGhpcyBjb21tb24gc3RlcCBpbnRvIG9uZSBibG9jaywgYW5kIG1h a2UgdGhlIHVuYWJsZSB0bwo+IGlvbWFwIGVycm9yIGNvZGUgY29uc2lzdGVudCAoaS5lLiB0cmVh dCBpdCBhcyBvdXQgb2YgbWVtb3J5IHRvIGF2b2lkCj4gY29uZnVzaW5nIGl0IHdpdGggYSBpbnZh bGlkIGFyZ3VtZW50KS4KPgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIHwgMjUgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5n ZWQsIDEyIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwo+IGluZGV4IDJlODY0YjdhNTI4Yi4uYzZhZTkyNTI5ZmRj IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+IEBAIC0yMTIx LDE1ICsyMTIxLDEzIEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAgCQkJcmV0dXJuIHJldDsKPgo+ICAgCQlyZXQgPSBpOTE1 X2dlbV9vYmplY3Rfc2V0X3RvX2NwdV9kb21haW4ob2JqLCB0cnVlKTsKPiAtCQlpZiAocmV0KSB7 Cj4gLQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9iaik7Cj4gLQkJCXJldHVybiByZXQ7 Cj4gLQkJfQo+ICsJCWlmIChyZXQpCj4gKwkJCWdvdG8gZXJyX3VucGluOwo+Cj4gICAJCXJpbmdi dWYtPnZpcnR1YWxfc3RhcnQgPSB2bWFwX29iaihvYmopOwo+ICAgCQlpZiAocmluZ2J1Zi0+dmly dHVhbF9zdGFydCA9PSBOVUxMKSB7Cj4gLQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9i aik7Cj4gLQkJCXJldHVybiAtRU5PTUVNOwo+ICsJCQlyZXQgPSAtRU5PTUVNOwo+ICsJCQlnb3Rv IGVycl91bnBpbjsKPiAgIAkJfQo+ICAgCX0gZWxzZSB7Cj4gICAJCXJldCA9IGk5MTVfZ2VtX29i al9nZ3R0X3BpbihvYmosIFBBR0VfU0laRSwgUElOX01BUFBBQkxFKTsKPiBAQCAtMjEzNywxMCAr MjEzNSw4IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAo+ICAgCQkJcmV0dXJuIHJldDsKPgo+ICAgCQlyZXQgPSBpOTE1X2dlbV9v YmplY3Rfc2V0X3RvX2d0dF9kb21haW4ob2JqLCB0cnVlKTsKPiAtCQlpZiAocmV0KSB7Cj4gLQkJ CWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9iaik7Cj4gLQkJCXJldHVybiByZXQ7Cj4gLQkJ fQo+ICsJCWlmIChyZXQpCj4gKwkJCWdvdG8gZXJyX3VucGluOwo+Cj4gICAJCS8qIEFjY2VzcyB0 aHJvdWdoIHRoZSBHVFQgcmVxdWlyZXMgdGhlIGRldmljZSB0byBiZSBhd2FrZS4gKi8KPiAgIAkJ YXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRldl9wcml2KTsKPiBAQCAtMjE0OCwxNCArMjE0NCwx NyBAQCBpbnQgaW50ZWxfcGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiAgIAkJcmluZ2J1Zi0+dmlydHVhbF9zdGFydCA9IGlvcmVtYXBfd2MoZ2d0dC0+ bWFwcGFibGVfYmFzZSArCj4gICAJCQkJCQkgICAgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9i aiksIHJpbmdidWYtPnNpemUpOwo+ICAgCQlpZiAocmluZ2J1Zi0+dmlydHVhbF9zdGFydCA9PSBO VUxMKSB7Cj4gLQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9iaik7Cj4gLQkJCXJldHVy biAtRUlOVkFMOwo+ICsJCQlyZXQgPSAtRU5PTUVNOwo+ICsJCQlnb3RvIGVycl91bnBpbjsKPiAg IAkJfQo+ICAgCX0KPgo+ICAgCXJpbmdidWYtPnZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0KG9i aik7Cj4gLQoKT19vIDpECgo+ICAgCXJldHVybiAwOwo+ICsKPiArZXJyX3VucGluOgo+ICsJaTkx NV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKPiArCXJldHVybiByZXQ7Cj4gICB9Cj4KPiAg IHN0YXRpYyB2b2lkIGludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGludGVsX3Jp bmdidWZmZXIgKnJpbmdidWYpCj4KClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv LnVyc3VsaW5AaW50ZWwuY29tPgoKUmVnYXJkcywKClR2cnRrbwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK