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

Commit 00fc2c26 authored by Chris Wilson's avatar Chris Wilson Committed by Dave Airlie
Browse files

drm: Remove unused drm_file parameter to drm_syncobj_replace_fence() 



the drm_file parameter is unused, so remove it.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Reviewed-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 97eaf753

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

+2 −4
Original line number Diff line number Diff line
@@ -1069,10 +1069,8 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p) 
{

	int i;



	for (i = 0; i < p->num_post_dep_syncobjs; ++i) {

		drm_syncobj_replace_fence(p->filp, p->post_dep_syncobjs[i],

					  p->fence);

	}

	for (i = 0; i < p->num_post_dep_syncobjs; ++i)

		drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence);

}



static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,

drivers/gpu/drm/drm_syncobj.c

+3 −5
Original line number Diff line number Diff line
@@ -77,17 +77,15 @@ EXPORT_SYMBOL(drm_syncobj_find); 


/**

 * drm_syncobj_replace_fence - replace fence in a sync object.

 * @file_private: drm file private pointer.

 * @syncobj: Sync object to replace fence in

 * @fence: fence to install in sync file.

 *

 * This replaces the fence on a sync object.

 */

void drm_syncobj_replace_fence(struct drm_file *file_private,

			       struct drm_syncobj *syncobj,

void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,

			       struct dma_fence *fence)

{

	struct dma_fence *old_fence = NULL;

	struct dma_fence *old_fence;



	if (fence)

		dma_fence_get(fence);
@@ -292,7 +290,7 @@ int drm_syncobj_import_sync_file_fence(struct drm_file *file_private, 
		return -ENOENT;

	}



	drm_syncobj_replace_fence(file_private, syncobj, fence);

	drm_syncobj_replace_fence(syncobj, fence);

	dma_fence_put(fence);

	drm_syncobj_put(syncobj);

	return 0;

include/drm/drm_syncobj.h

+1 −2
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ drm_syncobj_put(struct drm_syncobj *obj) 


struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,

				     u32 handle);

void drm_syncobj_replace_fence(struct drm_file *file_private,

			       struct drm_syncobj *syncobj,

void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,

			       struct dma_fence *fence);

int drm_syncobj_fence_get(struct drm_file *file_private,

			  u32 handle,