drm: expand replace_fence to support timeline point v2

we can place a fence to a timeline point after expanded.
v2: change func parameter order

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/246543/

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 5db7b1b..d68b73f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1191,7 +1191,7 @@ 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->post_dep_syncobjs[i], p->fence);
+               drm_syncobj_replace_fence(p->post_dep_syncobjs[i], 0, 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 e04b0f3..e9ce623 100644 (file)
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -167,11 +167,13 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj,
 /**
  * drm_syncobj_replace_fence - replace fence in a sync object.
  * @syncobj: Sync object to replace fence in
+ * @point: timeline point
  * @fence: fence to install in sync file.
  *
- * This replaces the fence on a sync object.
+ * This replaces the fence on a sync object, or a timeline point fence.
  */
 void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
+                              u64 point,
                               struct dma_fence *fence)
 {
        struct dma_fence *old_fence;
@@ -211,7 +213,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)
                       &fence->lock, 0, 0);
        dma_fence_signal(&fence->base);
 
-       drm_syncobj_replace_fence(syncobj, &fence->base);
+       drm_syncobj_replace_fence(syncobj, 0, &fence->base);
 
        dma_fence_put(&fence->base);
 
@@ -262,7 +264,7 @@ void drm_syncobj_free(struct kref *kref)
        struct drm_syncobj *syncobj = container_of(kref,
                                                   struct drm_syncobj,
                                                   refcount);
-       drm_syncobj_replace_fence(syncobj, NULL);
+       drm_syncobj_replace_fence(syncobj, 0, NULL);
        kfree(syncobj);
 }
 EXPORT_SYMBOL(drm_syncobj_free);
@@ -302,7 +304,7 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
        }
 
        if (fence)
-               drm_syncobj_replace_fence(syncobj, fence);
+               drm_syncobj_replace_fence(syncobj, 0, fence);
 
        *out_syncobj = syncobj;
        return 0;
@@ -487,7 +489,7 @@ static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
                return -ENOENT;
        }
 
-       drm_syncobj_replace_fence(syncobj, fence);
+       drm_syncobj_replace_fence(syncobj, 0, fence);
        dma_fence_put(fence);
        drm_syncobj_put(syncobj);
        return 0;
@@ -969,7 +971,7 @@ drm_syncobj_reset_ioctl(struct drm_device *dev, void *data,
                return ret;
 
        for (i = 0; i < args->count_handles; i++)
-               drm_syncobj_replace_fence(syncobjs[i], NULL);
+               drm_syncobj_replace_fence(syncobjs[i], 0, NULL);
 
        drm_syncobj_array_free(syncobjs, args->count_handles);
 

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 3f0c612..0a8d2d6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -2166,7 +2166,7 @@ signal_fence_array(struct i915_execbuffer *eb,
                if (!(flags & I915_EXEC_FENCE_SIGNAL))
                        continue;
 
-               drm_syncobj_replace_fence(syncobj, fence);
+               drm_syncobj_replace_fence(syncobj, 0, fence);
        }
 }
 

diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index 9b9ab34..70c5477 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -584,7 +584,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
        /* Update the return sync object for the */
        sync_out = drm_syncobj_find(file_priv, args->out_sync);
        if (sync_out) {
-               drm_syncobj_replace_fence(sync_out,
+               drm_syncobj_replace_fence(sync_out, 0,
                                          &exec->render.base.s_fence->finished);
                drm_syncobj_put(sync_out);
        }

diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 928718b..5b22e99 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -681,7 +681,7 @@ vc4_queue_submit(struct drm_device *dev, struct vc4_exec_info *exec,
        exec->fence = &fence->base;
 
        if (out_sync)
-               drm_syncobj_replace_fence(out_sync, exec->fence);
+               drm_syncobj_replace_fence(out_sync, 0, exec->fence);
 
        vc4_update_bo_seqnos(exec, seqno);
 

diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h
index ab9055f..425432b 100644 (file)
--- a/include/drm/drm_syncobj.h
+++ b/include/drm/drm_syncobj.h
@@ -131,7 +131,7 @@ drm_syncobj_fence_get(struct drm_syncobj *syncobj)
 
 struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,
                                     u32 handle);
-void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
+void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, u64 point,
                               struct dma_fence *fence);
 int drm_syncobj_find_fence(struct drm_file *file_private,
                           u32 handle, u64 point,