Commit 4a88f73f authored Jul 02, 2013 by Daniel Vetter Committed by Dave Airlie Jul 04, 2013

drm/prime: fix up handle_to_fd ioctl return value

In

commit da34242e
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>
Tested-by: lu hua <huax.lu@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 77ef8bbc

drivers/gpu/drm/drm_prime.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -347,10 +347,13 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev,
	out_have_obj:		out_have_obj:
	get_dma_buf(dmabuf);		get_dma_buf(dmabuf);
	ret = dma_buf_fd(dmabuf, flags);		ret = dma_buf_fd(dmabuf, flags);
	if (ret < 0)		if (ret < 0) {
	dma_buf_put(dmabuf);		dma_buf_put(dmabuf);
	else		} else {
	*prime_fd = ret;		*prime_fd = ret;
			ret = 0;
			}

	goto out;		goto out;

	fail_rm_handle:		fail_rm_handle:

Admin message