Skip to content

Commit 00fc2c2

Browse files
ickleairlied
authored andcommitted
drm: Remove unused drm_file parameter to drm_syncobj_replace_fence()
the drm_file parameter is unused, so remove it. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent 97eaf75 commit 00fc2c2

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,10 +1069,8 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)
10691069
{
10701070
int i;
10711071

1072-
for (i = 0; i < p->num_post_dep_syncobjs; ++i) {
1073-
drm_syncobj_replace_fence(p->filp, p->post_dep_syncobjs[i],
1074-
p->fence);
1075-
}
1072+
for (i = 0; i < p->num_post_dep_syncobjs; ++i)
1073+
drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence);
10761074
}
10771075

10781076
static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,

drivers/gpu/drm/drm_syncobj.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,15 @@ EXPORT_SYMBOL(drm_syncobj_find);
7777

7878
/**
7979
* drm_syncobj_replace_fence - replace fence in a sync object.
80-
* @file_private: drm file private pointer.
8180
* @syncobj: Sync object to replace fence in
8281
* @fence: fence to install in sync file.
8382
*
8483
* This replaces the fence on a sync object.
8584
*/
86-
void drm_syncobj_replace_fence(struct drm_file *file_private,
87-
struct drm_syncobj *syncobj,
85+
void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
8886
struct dma_fence *fence)
8987
{
90-
struct dma_fence *old_fence = NULL;
88+
struct dma_fence *old_fence;
9189

9290
if (fence)
9391
dma_fence_get(fence);
@@ -292,7 +290,7 @@ int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
292290
return -ENOENT;
293291
}
294292

295-
drm_syncobj_replace_fence(file_private, syncobj, fence);
293+
drm_syncobj_replace_fence(syncobj, fence);
296294
dma_fence_put(fence);
297295
drm_syncobj_put(syncobj);
298296
return 0;

include/drm/drm_syncobj.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ drm_syncobj_put(struct drm_syncobj *obj)
7979

8080
struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,
8181
u32 handle);
82-
void drm_syncobj_replace_fence(struct drm_file *file_private,
83-
struct drm_syncobj *syncobj,
82+
void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
8483
struct dma_fence *fence);
8584
int drm_syncobj_fence_get(struct drm_file *file_private,
8685
u32 handle,

0 commit comments

Comments
 (0)