Unverified Commit ba3f6db4 authored by Maíra Canal's avatar Maíra Canal Committed by Maíra Canal
Browse files

drm/vc4: replace obj lookup steps with drm_gem_objects_lookup 



As vc4_cl_lookup_bos() performs the same steps as drm_gem_objects_lookup(),
replace the open-coded implementation in vc4 to simply use the DRM function.

Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarMaíra Canal <mairacanal@riseup.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20230202111943.111757-3-mcanal@igalia.com
parent 47c07e46

drivers/gpu/drm/vc4/vc4_gem.c

+2 −41
Original line number Diff line number Diff line
@@ -746,7 +746,6 @@ vc4_cl_lookup_bos(struct drm_device *dev, 
		  struct vc4_exec_info *exec)

{

	struct drm_vc4_submit_cl *args = exec->args;

	uint32_t *handles;

	int ret = 0;

	int i;
@@ -760,43 +759,8 @@ vc4_cl_lookup_bos(struct drm_device *dev, 
		return -EINVAL;

	}



	exec->bo = kvmalloc_array(exec->bo_count,

				    sizeof(struct drm_gem_dma_object *),

				    GFP_KERNEL | __GFP_ZERO);

	if (!exec->bo) {

		DRM_ERROR("Failed to allocate validated BO pointers\n");

		return -ENOMEM;

	}



	handles = kvmalloc_array(exec->bo_count, sizeof(uint32_t), GFP_KERNEL);

	if (!handles) {

		ret = -ENOMEM;

		DRM_ERROR("Failed to allocate incoming GEM handles\n");

		goto fail;

	}



	if (copy_from_user(handles, u64_to_user_ptr(args->bo_handles),

			   exec->bo_count * sizeof(uint32_t))) {

		ret = -EFAULT;

		DRM_ERROR("Failed to copy in GEM handles\n");

		goto fail;

	}



	spin_lock(&file_priv->table_lock);

	for (i = 0; i < exec->bo_count; i++) {

		struct drm_gem_object *bo = idr_find(&file_priv->object_idr,

						     handles[i]);

		if (!bo) {

			DRM_DEBUG("Failed to look up GEM BO %d: %d\n",

				  i, handles[i]);

			ret = -EINVAL;

			break;

		}



		drm_gem_object_get(bo);

		exec->bo[i] = bo;

	}

	spin_unlock(&file_priv->table_lock);

	ret = drm_gem_objects_lookup(file_priv, u64_to_user_ptr(args->bo_handles),

				     exec->bo_count, &exec->bo);



	if (ret)

		goto fail_put_bo;
@@ -807,7 +771,6 @@ vc4_cl_lookup_bos(struct drm_device *dev, 
			goto fail_dec_usecnt;

	}



	kvfree(handles);

	return 0;



fail_dec_usecnt:
@@ -827,8 +790,6 @@ vc4_cl_lookup_bos(struct drm_device *dev, 
	for (i = 0; i < exec->bo_count && exec->bo[i]; i++)

		drm_gem_object_put(exec->bo[i]);



fail:

	kvfree(handles);

	kvfree(exec->bo);

	exec->bo = NULL;

	return ret;