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

Commit c1d6798d authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: use common drm_gem_dmabuf_release in i915/exynos drivers 



Note that this is slightly tricky since both drivers store their
native objects in dma_buf->priv. But both also embed the base
drm_gem_object at the first position, so the implicit cast is ok.

To use the release helper we need to export it, too.

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2bc7b0ca

drivers/gpu/drm/drm_prime.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, 
	/* nothing to be done here */

}



static void drm_gem_dmabuf_release(struct dma_buf *dma_buf)

void drm_gem_dmabuf_release(struct dma_buf *dma_buf)

{

	struct drm_gem_object *obj = dma_buf->priv;
@@ -202,6 +202,7 @@ static void drm_gem_dmabuf_release(struct dma_buf *dma_buf) 
		drm_gem_object_unreference_unlocked(obj);

	}

}

EXPORT_SYMBOL(drm_gem_dmabuf_release);



static void *drm_gem_dmabuf_vmap(struct dma_buf *dma_buf)

{

drivers/gpu/drm/exynos/exynos_drm_dmabuf.c

+1 −22
Original line number Diff line number Diff line
@@ -127,27 +127,6 @@ static void exynos_gem_unmap_dma_buf(struct dma_buf_attachment *attach, 
	/* Nothing to do. */

}



static void exynos_dmabuf_release(struct dma_buf *dmabuf)

{

	struct exynos_drm_gem_obj *exynos_gem_obj = dmabuf->priv;



	/*

	 * exynos_dmabuf_release() call means that file object's

	 * f_count is 0 and it calls drm_gem_object_handle_unreference()

	 * to drop the references that these values had been increased

	 * at drm_prime_handle_to_fd()

	 */

	if (exynos_gem_obj->base.export_dma_buf == dmabuf) {

		exynos_gem_obj->base.export_dma_buf = NULL;



		/*

		 * drop this gem object refcount to release allocated buffer

		 * and resources.

		 */

		drm_gem_object_unreference_unlocked(&exynos_gem_obj->base);

	}

}



static void *exynos_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf,

						unsigned long page_num)

{
@@ -193,7 +172,7 @@ static struct dma_buf_ops exynos_dmabuf_ops = { 
	.kunmap			= exynos_gem_dmabuf_kunmap,

	.kunmap_atomic		= exynos_gem_dmabuf_kunmap_atomic,

	.mmap			= exynos_gem_dmabuf_mmap,

	.release		= exynos_dmabuf_release,

	.release		= drm_gem_dmabuf_release,

};



struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+1 −12
Original line number Diff line number Diff line
@@ -90,17 +90,6 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment, 
	kfree(sg);

}



static void i915_gem_dmabuf_release(struct dma_buf *dma_buf)

{

	struct drm_i915_gem_object *obj = dma_buf->priv;



	if (obj->base.export_dma_buf == dma_buf) {

		/* drop the reference on the export fd holds */

		obj->base.export_dma_buf = NULL;

		drm_gem_object_unreference_unlocked(&obj->base);

	}

}



static void *i915_gem_dmabuf_vmap(struct dma_buf *dma_buf)

{

	struct drm_i915_gem_object *obj = dma_buf->priv;
@@ -211,7 +200,7 @@ static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, size_t start, size 
static const struct dma_buf_ops i915_dmabuf_ops =  {

	.map_dma_buf = i915_gem_map_dma_buf,

	.unmap_dma_buf = i915_gem_unmap_dma_buf,

	.release = i915_gem_dmabuf_release,

	.release = drm_gem_dmabuf_release,

	.kmap = i915_gem_dmabuf_kmap,

	.kmap_atomic = i915_gem_dmabuf_kmap_atomic,

	.kunmap = i915_gem_dmabuf_kunmap,

include/drm/drmP.h

+1 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,7 @@ extern struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, 
		struct dma_buf *dma_buf);

extern int drm_gem_prime_fd_to_handle(struct drm_device *dev,

		struct drm_file *file_priv, int prime_fd, uint32_t *handle);

extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf);



extern int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,

					struct drm_file *file_priv);