From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v7 1/7] drm/i915: deduplicate
	intel_pin_and_map_ringbuffer_obj() error handling
Date: Tue,  1 Mar 2016 16:33:53 +0000
Message-ID: <1456850039-25856-2-git-send-email-david.s.gordon@intel.com>
References: <1456850039-25856-1-git-send-email-david.s.gordon@intel.com>
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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 780716E048
 for <intel-gfx@lists.freedesktop.org>; Tue,  1 Mar 2016 16:34:20 +0000 (UTC)
In-Reply-To: <1456850039-25856-1-git-send-email-david.s.gordon@intel.com>
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

RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpSZXBsYWNlIG11
bHRpcGxlICJ1bnBpbigpOyByZXR1cm4gZXJybm87IiBzZXF1ZW5jZXMgd2l0aAphIGJyYW5jaCB0
byBhIHNpbmdsZSBjb21tb24gbGFiZWwgZm9yIGFsbCB0aGUgZXJyb3IgcGF0aHMuCgpFeHRyYWN0
ZWQgZnJvbSBDaHJpcyBXaWxzb24ncyBwYXRjaDoKICAgIGRybS9pOTE1OiBSZWZhY3RvciBkdXBs
aWNhdGUgb2JqZWN0IHZtYXAgZnVuY3Rpb25zCmluIHByZXBhcmF0aW9uIGZvciB0aGUgcmVpbXBs
ZW1lbnRhdGlvbiBvZiB0aGUgc2FtZS4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZp
ZC5zLmdvcmRvbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv
LnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u
Y28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMjQg
KysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygr
KSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j
CmluZGV4IDQ1Y2U0NWEuLjhmNTI1NTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n
YnVmZmVyLmMKQEAgLTIwOTgsMTUgKzIwOTgsMTMgQEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3Jp
bmdidWZmZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlyZXR1cm4gcmV0OwogCiAJ
CXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fY3B1X2RvbWFpbihvYmosIHRydWUpOwotCQlp
ZiAocmV0KSB7Ci0JCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOwotCQkJcmV0dXJu
IHJldDsKLQkJfQorCQlpZiAocmV0KQorCQkJZ290byB1bnBpbjsKIAogCQlyaW5nYnVmLT52aXJ0
dWFsX3N0YXJ0ID0gdm1hcF9vYmoob2JqKTsKIAkJaWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQg
PT0gTlVMTCkgewotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKLQkJCXJldHVy
biAtRU5PTUVNOworCQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8gdW5waW47CiAJCX0KIAl9IGVs
c2UgewogCQlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4ob2JqLCBQQUdFX1NJWkUsIFBJTl9N
QVBQQUJMRSk7CkBAIC0yMTE0LDEwICsyMTEyLDggQEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3Jp
bmdidWZmZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlyZXR1cm4gcmV0OwogCiAJ
CXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihvYmosIHRydWUpOwotCQlp
ZiAocmV0KSB7Ci0JCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOwotCQkJcmV0dXJu
IHJldDsKLQkJfQorCQlpZiAocmV0KQorCQkJZ290byB1bnBpbjsKIAogCQkvKiBBY2Nlc3MgdGhy
b3VnaCB0aGUgR1RUIHJlcXVpcmVzIHRoZSBkZXZpY2UgdG8gYmUgYXdha2UuICovCiAJCWFzc2Vy
dF9ycG1fd2FrZWxvY2tfaGVsZChkZXZfcHJpdik7CkBAIC0yMTI1LDE0ICsyMTIxLDE4IEBAIGlu
dCBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
LAogCQlyaW5nYnVmLT52aXJ0dWFsX3N0YXJ0ID0gaW9yZW1hcF93YyhkZXZfcHJpdi0+Z3R0Lm1h
cHBhYmxlX2Jhc2UgKwogCQkJCQkJICAgIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopLCBy
aW5nYnVmLT5zaXplKTsKIAkJaWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCkgewot
CQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKLQkJCXJldHVybiAtRUlOVkFMOwor
CQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8gdW5waW47CiAJCX0KIAl9CiAKIAlyaW5nYnVmLT52
bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChvYmopOwogCiAJcmV0dXJuIDA7CisKK3VucGluOgor
CWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9iaik7CisJcmV0dXJuIHJldDsKIH0KIAogc3Rh
dGljIHZvaWQgaW50ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1
ZmZlciAqcmluZ2J1ZikKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK