On Wed, Jul 5, 2017 at 1:12 PM, Chris Wilson <ch...@chris-wilson.co.uk>
wrote:
> the drm_file parameter is unused, so remove it.
>
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Cc: Dave Airlie <airl...@redhat.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++----
> drivers/gpu/drm/drm_syncobj.c | 8 +++-----
> include/drm/drm_syncobj.h | 3 +--
> 3 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index aeee6840e82b..8c73b91f0ddc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -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,
> diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
> index 89441bc78591..789ba0b37f7b 100644
> --- a/drivers/gpu/drm/drm_syncobj.c
> +++ b/drivers/gpu/drm/drm_syncobj.c
> @@ -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;
>
This change looks unrelated. Valid, but unrelated. :-)
Having worked through your i915 syncobj patch, this definitely makes some
things a little bit nicer.
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>
>
> 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;
> diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h
> index 2c3610a4a074..89976da542b1 100644
> --- a/include/drm/drm_syncobj.h
> +++ b/include/drm/drm_syncobj.h
> @@ -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,
> --
> 2.13.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
