Attachment 81783 Details for Bug 66436 – fix up handle_to_fd return value

[patch] fix up handle_to_fd return value

0001-drm-prime-fix-up-return-value.patch (text/plain), 1.43 KB, created by Daniel Vetter on 2013-07-01 08:11:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-07-01 08:11:40 UTC

Size: 1.43 KB

patch

obsolete

>From 730a3e06d84cddfc120f8b700cec3ff35223905f Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Mon, 1 Jul 2013 10:07:39 +0200
>Subject: [PATCH] drm/prime: fix up return value
>
>In
>
>commit da34242e5e0638312130f5bd5d2d277afbc6f806
>Author: YoungJun Cho <yj44.cho@samsung.com>
>Date:   Wed Jun 26 10:21:42 2013 +0900
>
>    drm/prime: add return check for dma_buf_fd
>
>the failure case handling was fixed up. But in the case when we
>already had the buffer exported it changed the return value:
>Previously we've return 0 on success, now we return the fd.
>
>This ABI change has been caught by i-g-t/prime_self_import/with_one_bo.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66436
>Cc: YoungJun Cho <yj44.cho@samsung.com>
>Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
>Cc: Kyungmin Park <kyungmin.park@samsung.com>
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/drm_prime.c |    7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>index 52709f2..1e0de41 100644
>--- a/drivers/gpu/drm/drm_prime.c
>+++ b/drivers/gpu/drm/drm_prime.c
>@@ -347,10 +347,13 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev,
> out_have_obj:
> 	get_dma_buf(dmabuf);
> 	ret = dma_buf_fd(dmabuf, flags);
>-	if (ret < 0)
>+	if (ret < 0) {
> 		dma_buf_put(dmabuf);
>-	else
>+	} else {
> 		*prime_fd = ret;
>+		ret = 0;
>+	}
>+
> 	goto out;
> 
> fail_rm_handle:
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 66436: 81783

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.