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

Commit afaf5923 authored by Jason Ekstrand's avatar Jason Ekstrand Committed by Dave Airlie
Browse files

drm/syncobj: Rename fence_get to find_fence 



The function has far more in common with drm_syncobj_find than with
any in the get/put functions.

Signed-off-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Acked-by: Christian König <christian.koenig@amd.com> (v1)
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 71f23543

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, 
{

	int r;

	struct dma_fence *fence;

	r = drm_syncobj_fence_get(p->filp, handle, &fence);

	r = drm_syncobj_find_fence(p->filp, handle, &fence);

	if (r)

		return r;

drivers/gpu/drm/drm_syncobj.c

+5 −5
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, 
}

EXPORT_SYMBOL(drm_syncobj_replace_fence);



int drm_syncobj_fence_get(struct drm_file *file_private,

int drm_syncobj_find_fence(struct drm_file *file_private,

			   u32 handle,

			   struct dma_fence **fence)

{
@@ -112,7 +112,7 @@ int drm_syncobj_fence_get(struct drm_file *file_private, 
	drm_syncobj_put(syncobj);

	return ret;

}

EXPORT_SYMBOL(drm_syncobj_fence_get);

EXPORT_SYMBOL(drm_syncobj_find_fence);



/**

 * drm_syncobj_free - free a sync object.
@@ -307,7 +307,7 @@ int drm_syncobj_export_sync_file(struct drm_file *file_private, 
	if (fd < 0)

		return fd;



	ret = drm_syncobj_fence_get(file_private, handle, &fence);

	ret = drm_syncobj_find_fence(file_private, handle, &fence);

	if (ret)

		goto err_put_fd;

include/drm/drm_syncobj.h

+3 −3
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, 
				     u32 handle);

void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,

			       struct dma_fence *fence);

int drm_syncobj_fence_get(struct drm_file *file_private,

int drm_syncobj_find_fence(struct drm_file *file_private,

			   u32 handle,

			   struct dma_fence **fence);

void drm_syncobj_free(struct kref *kref);