From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH v2 2/6] drm/i915: Consolidate common error
	handling in intel_pin_and_map_ringbuffer_obj
Date: Fri,  8 Apr 2016 12:11:10 +0100
Message-ID: <1460113874-17366-3-git-send-email-chris@chris-wilson.co.uk>
References: <1460113874-17366-1-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com
 [IPv6:2a00:1450:400c:c09::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 77EB36E54F
 for <intel-gfx@lists.freedesktop.org>; Fri,  8 Apr 2016 11:11:27 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id y144so3509271wmd.0
 for <intel-gfx@lists.freedesktop.org>; Fri, 08 Apr 2016 04:11:27 -0700 (PDT)
In-Reply-To: <1460113874-17366-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QWZ0ZXIgd2UgcGluIHRoZSByaW5nYnVmZmVyIGludG8gdGhlIEdHVFQsIGFsbCBlcnJvciBwYXRo
cyBuZWVkIHRvIHVucGluCml0IGFnYWluLiBNb3ZlIHRoaXMgY29tbW9uIHN0ZXAgaW50byBvbmUg
YmxvY2ssIGFuZCBtYWtlIHRoZSB1bmFibGUgdG8KaW9tYXAgZXJyb3IgY29kZSBjb25zaXN0ZW50
IChpLmUuIHRyZWF0IGl0IGFzIG91dCBvZiBtZW1vcnkgdG8gYXZvaWQKY29uZnVzaW5nIGl0IHdp
dGggYSBpbnZhbGlkIGFyZ3VtZW50KS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hy
aXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRr
by51cnN1bGluQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBp
bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwg
MjUgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlv
bnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm
ZXIuYwppbmRleCA2YjQ5NTIwMzFlMzAuLjYwMGNjYzQwM2IxZiAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjEyMSwxNSArMjEyMSwxMyBAQCBpbnQgaW50ZWxf
cGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCXJl
dHVybiByZXQ7CiAKIAkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3NldF90b19jcHVfZG9tYWluKG9i
aiwgdHJ1ZSk7Ci0JCWlmIChyZXQpIHsKLQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9i
aik7Ci0JCQlyZXR1cm4gcmV0OwotCQl9CisJCWlmIChyZXQpCisJCQlnb3RvIGVycl91bnBpbjsK
IAogCQlyaW5nYnVmLT52aXJ0dWFsX3N0YXJ0ID0gdm1hcF9vYmoob2JqKTsKIAkJaWYgKHJpbmdi
dWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCkgewotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5w
aW4ob2JqKTsKLQkJCXJldHVybiAtRU5PTUVNOworCQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8g
ZXJyX3VucGluOwogCQl9CiAJfSBlbHNlIHsKIAkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGlu
KG9iaiwgUEFHRV9TSVpFLCBQSU5fTUFQUEFCTEUpOwpAQCAtMjEzNywxMCArMjEzNSw4IEBAIGlu
dCBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
LAogCQkJcmV0dXJuIHJldDsKIAogCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2d0dF9k
b21haW4ob2JqLCB0cnVlKTsKLQkJaWYgKHJldCkgewotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRf
dW5waW4ob2JqKTsKLQkJCXJldHVybiByZXQ7Ci0JCX0KKwkJaWYgKHJldCkKKwkJCWdvdG8gZXJy
X3VucGluOwogCiAJCS8qIEFjY2VzcyB0aHJvdWdoIHRoZSBHVFQgcmVxdWlyZXMgdGhlIGRldmlj
ZSB0byBiZSBhd2FrZS4gKi8KIAkJYXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRldl9wcml2KTsK
QEAgLTIxNDgsMTQgKzIxNDQsMTcgQEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJf
b2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPSBp
b3JlbWFwX3djKGdndHQtPm1hcHBhYmxlX2Jhc2UgKwogCQkJCQkJICAgIGk5MTVfZ2VtX29ial9n
Z3R0X29mZnNldChvYmopLCByaW5nYnVmLT5zaXplKTsKIAkJaWYgKHJpbmdidWYtPnZpcnR1YWxf
c3RhcnQgPT0gTlVMTCkgewotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKLQkJ
CXJldHVybiAtRUlOVkFMOworCQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8gZXJyX3VucGluOwog
CQl9CiAJfQogCiAJcmluZ2J1Zi0+dm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQob2JqKTsKLQog
CXJldHVybiAwOworCitlcnJfdW5waW46CisJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2Jq
KTsKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kZXN0cm95X3JpbmdidWZm
ZXJfb2JqKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQotLSAKMi44LjAucmMzCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0
cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK