From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 2/4] drm/prime: cleanup goto mess in drm_gem_prime_handle_to_fd Date: Thu, 15 Oct 2015 11:51:39 +1000 Message-ID: <1444873901-32043-3-git-send-email-airlied@gmail.com> References: <1444873901-32043-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id C29AD6EDAD for ; Wed, 14 Oct 2015 18:51:45 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 7075A319B62 for ; Thu, 15 Oct 2015 01:51:45 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com. (dhcp-40-179.bne.redhat.com [10.64.40.179]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9F1pg6K026886 for ; Wed, 14 Oct 2015 21:51:44 -0400 In-Reply-To: <1444873901-32043-1-git-send-email-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCkkgdGhpbmsgSSBtaWdodCBo YXZlIGJlZW4gcmVzcG9uc2libGUgZm9yIHNvbWUgb2YgdGhpcywgYnV0IGl0J3MgbWVzc3kKdG8g ZGVjb2RlLCB0aGlzIGRvZXNuJ3QgY2hhbmdlIGFueXRoaW5nLCBidXQgY2xlYW5zIHVwIHRoZSBn b3RvJ3MKYW5kIGV4aXQgcGF0aHMuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGll ZEByZWRoYXQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyB8IDczICsrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDMyIGluc2VydGlvbnMoKyksIDQxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fcHJpbWUuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYwppbmRleCA5 ZjkzNWY1Li5kMjJjZTgzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jCkBAIC00MjAsNDcgKzQyMCw0MiBAQCBp bnQgZHJtX2dlbV9wcmltZV9oYW5kbGVfdG9fZmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlk bWFidWYgPSBkcm1fcHJpbWVfbG9va3VwX2J1Zl9ieV9oYW5kbGUoJmZpbGVfcHJpdi0+cHJpbWUs IGhhbmRsZSk7CiAJaWYgKGRtYWJ1ZikgewogCQlnZXRfZG1hX2J1ZihkbWFidWYpOwotCQlnb3Rv IG91dF9oYXZlX2hhbmRsZTsKLQl9Ci0KLQltdXRleF9sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xv Y2spOwotCS8qIHJlLWV4cG9ydCB0aGUgb3JpZ2luYWwgaW1wb3J0ZWQgb2JqZWN0ICovCi0JaWYg KG9iai0+aW1wb3J0X2F0dGFjaCkgewotCQlkbWFidWYgPSBvYmotPmltcG9ydF9hdHRhY2gtPmRt YWJ1ZjsKLQkJZ2V0X2RtYV9idWYoZG1hYnVmKTsKLQkJZ290byBvdXRfaGF2ZV9vYmo7Ci0JfQot Ci0JaWYgKG9iai0+ZG1hX2J1ZikgewotCQlnZXRfZG1hX2J1ZihvYmotPmRtYV9idWYpOwotCQlk bWFidWYgPSBvYmotPmRtYV9idWY7Ci0JCWdvdG8gb3V0X2hhdmVfb2JqOwotCX0KKwl9IGVsc2Ug eworCQltdXRleF9sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOworCQkvKiByZS1leHBvcnQg dGhlIG9yaWdpbmFsIGltcG9ydGVkIG9iamVjdCAqLworCQlpZiAob2JqLT5pbXBvcnRfYXR0YWNo KSB7CisJCQlkbWFidWYgPSBvYmotPmltcG9ydF9hdHRhY2gtPmRtYWJ1ZjsKKwkJCWdldF9kbWFf YnVmKGRtYWJ1Zik7CisJCX0gZWxzZSBpZiAob2JqLT5kbWFfYnVmKSB7CisJCQlnZXRfZG1hX2J1 ZihvYmotPmRtYV9idWYpOworCQkJZG1hYnVmID0gb2JqLT5kbWFfYnVmOworCQl9IGVsc2Ugewor CQkJZG1hYnVmID0gZXhwb3J0X2FuZF9yZWdpc3Rlcl9vYmplY3QoZGV2LCBvYmosIGZsYWdzKTsK KwkJCWlmIChJU19FUlIoZG1hYnVmKSkgeworCQkJCS8qIG5vcm1hbGx5IHRoZSBjcmVhdGVkIGRt YS1idWYgdGFrZXMgb3duZXJzaGlwIG9mIHRoZSByZWYsCisJCQkJICogYnV0IGlmIHRoYXQgZmFp bHMgdGhlbiBkcm9wIHRoZSByZWYKKwkJCQkgKi8KKwkJCQlyZXQgPSBQVFJfRVJSKGRtYWJ1Zik7 CisJCQkJbXV0ZXhfdW5sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOworCQkJCWdvdG8gb3V0 OworCQkJfQorCQl9CiAKLQlkbWFidWYgPSBleHBvcnRfYW5kX3JlZ2lzdGVyX29iamVjdChkZXYs IG9iaiwgZmxhZ3MpOwotCWlmIChJU19FUlIoZG1hYnVmKSkgewotCQkvKiBub3JtYWxseSB0aGUg Y3JlYXRlZCBkbWEtYnVmIHRha2VzIG93bmVyc2hpcCBvZiB0aGUgcmVmLAotCQkgKiBidXQgaWYg dGhhdCBmYWlscyB0aGVuIGRyb3AgdGhlIHJlZgorCQkvKgorCQkgKiBJZiB3ZSd2ZSBleHBvcnRl ZCB0aGlzIGJ1ZmZlciB0aGVuIGNoZWF0IGFuZCBhZGQgaXQgdG8gdGhlIGltcG9ydCBsaXN0CisJ CSAqIHNvIHdlIGdldCB0aGUgY29ycmVjdCBoYW5kbGUgYmFjay4gV2UgbXVzdCBkbyB0aGlzIHVu ZGVyIHRoZQorCQkgKiBwcm90ZWN0aW9uIG9mIGRldi0+b2JqZWN0X25hbWVfbG9jayB0byBlbnN1 cmUgdGhhdCBhIHJhY2luZyBnZW0gY2xvc2UKKwkJICogaW9jdGwgZG9lc24ndCBtaXNzIHRvIHJl bW92ZSB0aGlzIGJ1ZmZlciBoYW5kbGUgZnJvbSB0aGUgY2FjaGUuCiAJCSAqLwotCQlyZXQgPSBQ VFJfRVJSKGRtYWJ1Zik7CisJCXJldCA9IGRybV9wcmltZV9hZGRfYnVmX2hhbmRsZSgmZmlsZV9w cml2LT5wcmltZSwKKwkJCQkJICAgICAgIGRtYWJ1ZiwgaGFuZGxlKTsKIAkJbXV0ZXhfdW5sb2Nr KCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOwotCQlnb3RvIG91dDsKKwkJaWYgKHJldCkgeworCQkJ ZG1hX2J1Zl9wdXQoZG1hYnVmKTsKKwkJCWdvdG8gb3V0OworCQl9CiAJfQogCi1vdXRfaGF2ZV9v Ymo6Ci0JLyoKLQkgKiBJZiB3ZSd2ZSBleHBvcnRlZCB0aGlzIGJ1ZmZlciB0aGVuIGNoZWF0IGFu ZCBhZGQgaXQgdG8gdGhlIGltcG9ydCBsaXN0Ci0JICogc28gd2UgZ2V0IHRoZSBjb3JyZWN0IGhh bmRsZSBiYWNrLiBXZSBtdXN0IGRvIHRoaXMgdW5kZXIgdGhlCi0JICogcHJvdGVjdGlvbiBvZiBk ZXYtPm9iamVjdF9uYW1lX2xvY2sgdG8gZW5zdXJlIHRoYXQgYSByYWNpbmcgZ2VtIGNsb3NlCi0J ICogaW9jdGwgZG9lc24ndCBtaXNzIHRvIHJlbW92ZSB0aGlzIGJ1ZmZlciBoYW5kbGUgZnJvbSB0 aGUgY2FjaGUuCi0JICovCi0JcmV0ID0gZHJtX3ByaW1lX2FkZF9idWZfaGFuZGxlKCZmaWxlX3By aXYtPnByaW1lLAotCQkJCSAgICAgICBkbWFidWYsIGhhbmRsZSk7Ci0JbXV0ZXhfdW5sb2NrKCZk ZXYtPm9iamVjdF9uYW1lX2xvY2spOwotCWlmIChyZXQpCi0JCWdvdG8gZmFpbF9wdXRfZG1hYnVm OwotCi1vdXRfaGF2ZV9oYW5kbGU6CiAJcmV0ID0gZG1hX2J1Zl9mZChkbWFidWYsIGZsYWdzKTsK IAkvKgogCSAqIFdlIG11c3QgX25vdF8gcmVtb3ZlIHRoZSBidWZmZXIgZnJvbSB0aGUgaGFuZGxl IGNhY2hlIHNpbmNlIHRoZSBuZXdseQpAQCAtNDY5LDE2ICs0NjQsMTIgQEAgb3V0X2hhdmVfaGFu ZGxlOgogCSAqIENsb3NpbmcgdGhlIGhhbmRsZSB3aWxsIGNsZWFuIG91dCB0aGUgY2FjaGUgYW55 d2F5LCBzbyB3ZSBkb24ndCBsZWFrLgogCSAqLwogCWlmIChyZXQgPCAwKSB7Ci0JCWdvdG8gZmFp bF9wdXRfZG1hYnVmOworCQlkbWFfYnVmX3B1dChkbWFidWYpOwogCX0gZWxzZSB7CiAJCSpwcmlt ZV9mZCA9IHJldDsKIAkJcmV0ID0gMDsKIAl9CiAKLQlnb3RvIG91dDsKLQotZmFpbF9wdXRfZG1h YnVmOgotCWRtYV9idWZfcHV0KGRtYWJ1Zik7CiBvdXQ6CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZl cmVuY2VfdW5sb2NrZWQob2JqKTsKIG91dF91bmxvY2s6Ci0tIAoyLjUuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK