Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72a93e8d authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm: Take ownership of the dmabuf->obj when exporting 



Currently the reference for the dmabuf->obj is incremented for the
dmabuf in drm_gem_prime_handle_to_fd() (at the high level userspace
interface), but is released in drm_gem_dmabuf_release() (the lowlevel
handler). Improve the symmetry of the dmabuf->obj ownership by acquiring
the reference in drm_gem_dmabuf_export(). This makes it easier to use
the prime functions directly.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Update kerneldoc.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161207214527.22533-1-chris@chris-wilson.co.uk
parent f3f4c4d6

drivers/gpu/drm/drm_prime.c

+7 −5
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ static void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, 
 *

 * This wraps dma_buf_export() for use by generic GEM drivers that are using

 * drm_gem_dmabuf_release(). In addition to calling dma_buf_export(), we take

 * a reference to the drm_device which is released by drm_gem_dmabuf_release().

 * a reference to the &drm_device and the exported &drm_gem_object (stored in

 * exp_info->priv) which is released by drm_gem_dmabuf_release().

 *

 * Returns the new dmabuf.

 */
@@ -300,8 +301,11 @@ struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev, 
	struct dma_buf *dma_buf;



	dma_buf = dma_buf_export(exp_info);

	if (!IS_ERR(dma_buf))

	if (IS_ERR(dma_buf))

		return dma_buf;



	drm_dev_ref(dev);

	drm_gem_object_reference(exp_info->priv);



	return dma_buf;

}
@@ -472,8 +476,6 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, 
	 */

	obj->dma_buf = dmabuf;

	get_dma_buf(obj->dma_buf);

	/* Grab a new ref since the callers is now used by the dma-buf */

	drm_gem_object_reference(obj);



	return dmabuf;

}

drivers/gpu/drm/vgem/vgem_fence.c

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static int attach_dmabuf(struct drm_device *dev, 
		return PTR_ERR(dmabuf);



	obj->dma_buf = dmabuf;

	drm_gem_object_reference(obj);

	return 0;

}