From: Dave Gordon Subject: [PATCH v5 6/7] drm/i915: deduplicate intel_pin_and_map_ringbuffer_obj() error handling Date: Mon, 29 Feb 2016 11:13:13 +0000 Message-ID: <1456744394-29831-7-git-send-email-david.s.gordon@intel.com> References: <1456744394-29831-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: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id ED3116E26B for ; Mon, 29 Feb 2016 11:13:34 +0000 (UTC) In-Reply-To: <1456744394-29831-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpSZXBsYWNlIG11 bHRpcGxlICJ1bnBpbigpOyByZXR1cm4gZXJybm87IiBzZXF1ZW5jZXMgd2l0aAphIGJyYW5jaCB0 byBhIHNpbmdsZSBjb21tb24gbGFiZWwgZm9yIGFsbCB0aGUgZXJyb3IgcGF0aHMuCgpFeHRyYWN0 ZWQgZnJvbSBDaHJpcyBXaWxzb24ncyBwYXRjaDoKICAgIGRybS9pOTE1OiBSZWZhY3RvciBkdXBs aWNhdGUgb2JqZWN0IHZtYXAgZnVuY3Rpb25zCmluIHByZXBhcmF0aW9uIGZvciB0aGUgcmVpbXBs ZW1lbnRhdGlvbiBvZiB0aGUgc2FtZS4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZp ZC5zLmdvcmRvbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMjQgKysrKysrKysr KysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDQz NGE0NTIuLjE1ZTJkMjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK QEAgLTIwNzcsMTYgKzIwNzcsMTQgQEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJf b2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlyZXR1cm4gcmV0OwogCiAJCXJldCA9IGk5 MTVfZ2VtX29iamVjdF9zZXRfdG9fY3B1X2RvbWFpbihvYmosIHRydWUpOwotCQlpZiAocmV0KSB7 Ci0JCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOwotCQkJcmV0dXJuIHJldDsKLQkJ fQorCQlpZiAocmV0KQorCQkJZ290byB1bnBpbjsKIAogCQlyaW5nYnVmLT52aXJ0dWFsX3N0YXJ0 ID0gaTkxNV9nZW1fb2JqZWN0X3ZtYXBfcmFuZ2Uob2JqLCAwLAogCQkJCQkJcmluZ2J1Zi0+c2l6 ZSA+PiBQQUdFX1NISUZUKTsKIAkJaWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCkg ewotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKLQkJCXJldHVybiAtRU5PTUVN OworCQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8gdW5waW47CiAJCX0KIAl9IGVsc2UgewogCQly ZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4ob2JqLCBQQUdFX1NJWkUsIFBJTl9NQVBQQUJMRSk7 CkBAIC0yMDk0LDEwICsyMDkyLDggQEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJf b2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlyZXR1cm4gcmV0OwogCiAJCXJldCA9IGk5 MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihvYmosIHRydWUpOwotCQlpZiAocmV0KSB7 Ci0JCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOwotCQkJcmV0dXJuIHJldDsKLQkJ fQorCQlpZiAocmV0KQorCQkJZ290byB1bnBpbjsKIAogCQkvKiBBY2Nlc3MgdGhyb3VnaCB0aGUg R1RUIHJlcXVpcmVzIHRoZSBkZXZpY2UgdG8gYmUgYXdha2UuICovCiAJCWFzc2VydF9ycG1fd2Fr ZWxvY2tfaGVsZChkZXZfcHJpdik7CkBAIC0yMTA1LDE0ICsyMTAxLDE4IEBAIGludCBpbnRlbF9w aW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyaW5n YnVmLT52aXJ0dWFsX3N0YXJ0ID0gaW9yZW1hcF93YyhkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlX2Jh c2UgKwogCQkJCQkJICAgIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopLCByaW5nYnVmLT5z aXplKTsKIAkJaWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCkgewotCQkJaTkxNV9n ZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKLQkJCXJldHVybiAtRUlOVkFMOworCQkJcmV0ID0g LUVOT01FTTsKKwkJCWdvdG8gdW5waW47CiAJCX0KIAl9CiAKIAlyaW5nYnVmLT52bWEgPSBpOTE1 X2dlbV9vYmpfdG9fZ2d0dChvYmopOwogCiAJcmV0dXJuIDA7CisKK3VucGluOgorCWk5MTVfZ2Vt X29iamVjdF9nZ3R0X3VucGluKG9iaik7CisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIHZvaWQg aW50ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu Z2J1ZikKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK