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

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

drm/prime: use proper pointer in drm_gem_prime_handle_to_fd 



Part of the function uses the properly-typed dmabuf variable, the
other an untyped void *buf. Kill the later.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent becee2a5

drivers/gpu/drm/drm_prime.c

+8 −8
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, 
		int *prime_fd)

{

	struct drm_gem_object *obj;

	void *buf;

	int ret = 0;

	struct dma_buf *dmabuf;
@@ -323,15 +322,15 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, 
		goto out_have_obj;

	}



	buf = dev->driver->gem_prime_export(dev, obj, flags);

	if (IS_ERR(buf)) {

	dmabuf = dev->driver->gem_prime_export(dev, obj, flags);

	if (IS_ERR(dmabuf)) {

		/* normally the created dma-buf takes ownership of the ref,

		 * but if that fails then drop the ref

		 */

		ret = PTR_ERR(buf);

		ret = PTR_ERR(dmabuf);

		goto out;

	}

	obj->export_dma_buf = buf;

	obj->export_dma_buf = dmabuf;



	/* if we've exported this buffer the cheat and add it to the import list

	 * so we get the correct handle back
@@ -341,7 +340,7 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, 
	if (ret)

		goto fail_put_dmabuf;



	ret = dma_buf_fd(buf, flags);

	ret = dma_buf_fd(dmabuf, flags);

	if (ret < 0)

		goto fail_rm_handle;
@@ -362,11 +361,12 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, 
	goto out;



fail_rm_handle:

	drm_prime_remove_buf_handle_locked(&file_priv->prime, buf);

	drm_prime_remove_buf_handle_locked(&file_priv->prime,

					   dmabuf);

fail_put_dmabuf:

	/* clear NOT to be checked when releasing dma_buf */

	obj->export_dma_buf = NULL;

	dma_buf_put(buf);

	dma_buf_put(dmabuf);

out:

	drm_gem_object_unreference_unlocked(obj);

	mutex_unlock(&file_priv->prime.lock);