From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/4] drm/prime: cleanup goto mess in drm_gem_prime_handle_to_fd Date: Thu, 15 Oct 2015 08:30:30 +0200 Message-ID: <20151015063030.GN26718@phenom.ffwll.local> References: <1444873901-32043-1-git-send-email-airlied@gmail.com> <1444873901-32043-3-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 mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id C01DA6EE2E for ; Wed, 14 Oct 2015 23:27:36 -0700 (PDT) Received: by wijq8 with SMTP id q8so113723022wij.0 for ; Wed, 14 Oct 2015 23:27:35 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1444873901-32043-3-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: Dave Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMTUsIDIwMTUgYXQgMTE6NTE6MzlBTSArMTAwMCwgRGF2ZSBBaXJsaWUgd3Jv dGU6Cj4gRnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KPiAKPiBJIHRoaW5r IEkgbWlnaHQgaGF2ZSBiZWVuIHJlc3BvbnNpYmxlIGZvciBzb21lIG9mIHRoaXMsIGJ1dCBpdCdz IG1lc3N5Cj4gdG8gZGVjb2RlLCB0aGlzIGRvZXNuJ3QgY2hhbmdlIGFueXRoaW5nLCBidXQgY2xl YW5zIHVwIHRoZSBnb3RvJ3MKPiBhbmQgZXhpdCBwYXRocy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBE YXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgoKQmVmb3JlIGNvZmZlZSwgYnV0IGxvb2tz IGdvb2QuIFJldmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNo Pgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMgfCA3MyArKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDMyIGlu c2VydGlvbnMoKyksIDQxIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3ByaW1lLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKPiBpbmRleCA5 ZjkzNWY1Li5kMjJjZTgzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUu Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYwo+IEBAIC00MjAsNDcgKzQyMCw0 MiBAQCBpbnQgZHJtX2dlbV9wcmltZV9oYW5kbGVfdG9fZmQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKPiAgCWRtYWJ1ZiA9IGRybV9wcmltZV9sb29rdXBfYnVmX2J5X2hhbmRsZSgmZmlsZV9wcml2 LT5wcmltZSwgaGFuZGxlKTsKPiAgCWlmIChkbWFidWYpIHsKPiAgCQlnZXRfZG1hX2J1ZihkbWFi dWYpOwo+IC0JCWdvdG8gb3V0X2hhdmVfaGFuZGxlOwo+IC0JfQo+IC0KPiAtCW11dGV4X2xvY2so JmRldi0+b2JqZWN0X25hbWVfbG9jayk7Cj4gLQkvKiByZS1leHBvcnQgdGhlIG9yaWdpbmFsIGlt cG9ydGVkIG9iamVjdCAqLwo+IC0JaWYgKG9iai0+aW1wb3J0X2F0dGFjaCkgewo+IC0JCWRtYWJ1 ZiA9IG9iai0+aW1wb3J0X2F0dGFjaC0+ZG1hYnVmOwo+IC0JCWdldF9kbWFfYnVmKGRtYWJ1Zik7 Cj4gLQkJZ290byBvdXRfaGF2ZV9vYmo7Cj4gLQl9Cj4gLQo+IC0JaWYgKG9iai0+ZG1hX2J1Zikg ewo+IC0JCWdldF9kbWFfYnVmKG9iai0+ZG1hX2J1Zik7Cj4gLQkJZG1hYnVmID0gb2JqLT5kbWFf YnVmOwo+IC0JCWdvdG8gb3V0X2hhdmVfb2JqOwo+IC0JfQo+ICsJfSBlbHNlIHsKPiArCQltdXRl eF9sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOwo+ICsJCS8qIHJlLWV4cG9ydCB0aGUgb3Jp Z2luYWwgaW1wb3J0ZWQgb2JqZWN0ICovCj4gKwkJaWYgKG9iai0+aW1wb3J0X2F0dGFjaCkgewo+ ICsJCQlkbWFidWYgPSBvYmotPmltcG9ydF9hdHRhY2gtPmRtYWJ1ZjsKPiArCQkJZ2V0X2RtYV9i dWYoZG1hYnVmKTsKPiArCQl9IGVsc2UgaWYgKG9iai0+ZG1hX2J1Zikgewo+ICsJCQlnZXRfZG1h X2J1ZihvYmotPmRtYV9idWYpOwo+ICsJCQlkbWFidWYgPSBvYmotPmRtYV9idWY7Cj4gKwkJfSBl bHNlIHsKPiArCQkJZG1hYnVmID0gZXhwb3J0X2FuZF9yZWdpc3Rlcl9vYmplY3QoZGV2LCBvYmos IGZsYWdzKTsKPiArCQkJaWYgKElTX0VSUihkbWFidWYpKSB7Cj4gKwkJCQkvKiBub3JtYWxseSB0 aGUgY3JlYXRlZCBkbWEtYnVmIHRha2VzIG93bmVyc2hpcCBvZiB0aGUgcmVmLAo+ICsJCQkJICog YnV0IGlmIHRoYXQgZmFpbHMgdGhlbiBkcm9wIHRoZSByZWYKPiArCQkJCSAqLwo+ICsJCQkJcmV0 ID0gUFRSX0VSUihkbWFidWYpOwo+ICsJCQkJbXV0ZXhfdW5sb2NrKCZkZXYtPm9iamVjdF9uYW1l X2xvY2spOwo+ICsJCQkJZ290byBvdXQ7Cj4gKwkJCX0KPiArCQl9Cj4gIAo+IC0JZG1hYnVmID0g ZXhwb3J0X2FuZF9yZWdpc3Rlcl9vYmplY3QoZGV2LCBvYmosIGZsYWdzKTsKPiAtCWlmIChJU19F UlIoZG1hYnVmKSkgewo+IC0JCS8qIG5vcm1hbGx5IHRoZSBjcmVhdGVkIGRtYS1idWYgdGFrZXMg b3duZXJzaGlwIG9mIHRoZSByZWYsCj4gLQkJICogYnV0IGlmIHRoYXQgZmFpbHMgdGhlbiBkcm9w IHRoZSByZWYKPiArCQkvKgo+ICsJCSAqIElmIHdlJ3ZlIGV4cG9ydGVkIHRoaXMgYnVmZmVyIHRo ZW4gY2hlYXQgYW5kIGFkZCBpdCB0byB0aGUgaW1wb3J0IGxpc3QKPiArCQkgKiBzbyB3ZSBnZXQg dGhlIGNvcnJlY3QgaGFuZGxlIGJhY2suIFdlIG11c3QgZG8gdGhpcyB1bmRlciB0aGUKPiArCQkg KiBwcm90ZWN0aW9uIG9mIGRldi0+b2JqZWN0X25hbWVfbG9jayB0byBlbnN1cmUgdGhhdCBhIHJh Y2luZyBnZW0gY2xvc2UKPiArCQkgKiBpb2N0bCBkb2Vzbid0IG1pc3MgdG8gcmVtb3ZlIHRoaXMg YnVmZmVyIGhhbmRsZSBmcm9tIHRoZSBjYWNoZS4KPiAgCQkgKi8KPiAtCQlyZXQgPSBQVFJfRVJS KGRtYWJ1Zik7Cj4gKwkJcmV0ID0gZHJtX3ByaW1lX2FkZF9idWZfaGFuZGxlKCZmaWxlX3ByaXYt PnByaW1lLAo+ICsJCQkJCSAgICAgICBkbWFidWYsIGhhbmRsZSk7Cj4gIAkJbXV0ZXhfdW5sb2Nr KCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOwo+IC0JCWdvdG8gb3V0Owo+ICsJCWlmIChyZXQpIHsK PiArCQkJZG1hX2J1Zl9wdXQoZG1hYnVmKTsKPiArCQkJZ290byBvdXQ7Cj4gKwkJfQo+ICAJfQo+ ICAKPiAtb3V0X2hhdmVfb2JqOgo+IC0JLyoKPiAtCSAqIElmIHdlJ3ZlIGV4cG9ydGVkIHRoaXMg YnVmZmVyIHRoZW4gY2hlYXQgYW5kIGFkZCBpdCB0byB0aGUgaW1wb3J0IGxpc3QKPiAtCSAqIHNv IHdlIGdldCB0aGUgY29ycmVjdCBoYW5kbGUgYmFjay4gV2UgbXVzdCBkbyB0aGlzIHVuZGVyIHRo ZQo+IC0JICogcHJvdGVjdGlvbiBvZiBkZXYtPm9iamVjdF9uYW1lX2xvY2sgdG8gZW5zdXJlIHRo YXQgYSByYWNpbmcgZ2VtIGNsb3NlCj4gLQkgKiBpb2N0bCBkb2Vzbid0IG1pc3MgdG8gcmVtb3Zl IHRoaXMgYnVmZmVyIGhhbmRsZSBmcm9tIHRoZSBjYWNoZS4KPiAtCSAqLwo+IC0JcmV0ID0gZHJt X3ByaW1lX2FkZF9idWZfaGFuZGxlKCZmaWxlX3ByaXYtPnByaW1lLAo+IC0JCQkJICAgICAgIGRt YWJ1ZiwgaGFuZGxlKTsKPiAtCW11dGV4X3VubG9jaygmZGV2LT5vYmplY3RfbmFtZV9sb2NrKTsK PiAtCWlmIChyZXQpCj4gLQkJZ290byBmYWlsX3B1dF9kbWFidWY7Cj4gLQo+IC1vdXRfaGF2ZV9o YW5kbGU6Cj4gIAlyZXQgPSBkbWFfYnVmX2ZkKGRtYWJ1ZiwgZmxhZ3MpOwo+ICAJLyoKPiAgCSAq IFdlIG11c3QgX25vdF8gcmVtb3ZlIHRoZSBidWZmZXIgZnJvbSB0aGUgaGFuZGxlIGNhY2hlIHNp bmNlIHRoZSBuZXdseQo+IEBAIC00NjksMTYgKzQ2NCwxMiBAQCBvdXRfaGF2ZV9oYW5kbGU6Cj4g IAkgKiBDbG9zaW5nIHRoZSBoYW5kbGUgd2lsbCBjbGVhbiBvdXQgdGhlIGNhY2hlIGFueXdheSwg c28gd2UgZG9uJ3QgbGVhay4KPiAgCSAqLwo+ICAJaWYgKHJldCA8IDApIHsKPiAtCQlnb3RvIGZh aWxfcHV0X2RtYWJ1ZjsKPiArCQlkbWFfYnVmX3B1dChkbWFidWYpOwo+ICAJfSBlbHNlIHsKPiAg CQkqcHJpbWVfZmQgPSByZXQ7Cj4gIAkJcmV0ID0gMDsKPiAgCX0KPiAgCj4gLQlnb3RvIG91dDsK PiAtCj4gLWZhaWxfcHV0X2RtYWJ1ZjoKPiAtCWRtYV9idWZfcHV0KGRtYWJ1Zik7Cj4gIG91dDoK PiAgCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKG9iaik7Cj4gIG91dF91bmxv Y2s6Cj4gLS0gCj4gMi41LjAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIElu dGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==