Skip to content

Commit

Permalink
drm: Remove unused drm_file parameter to drm_syncobj_replace_fence()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ickle authored and airlied committed Jul 6, 2017
1 parent 97eaf75 commit 00fc2c2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
6 changes: 2 additions & 4 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 3 additions & 5 deletions drivers/gpu/drm/drm_syncobj.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions include/drm/drm_syncobj.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 00fc2c2

Please sign in to comment.