Re: [PATCH 4/5] drm: expand replace_fence to support timeline point

Christian König <ckoenig.leichtzumerken@xxxxxxxxx> · Thu, 23 Aug 2018 11:06:20 +0200

Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
we can place a fence to a timeline point after expanded.

Signed-off-by: Chunming Zhou <david1.zhou@xxxxxxx>
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  2 +-
  drivers/gpu/drm/drm_syncobj.c              | 16 +++++++++-------
  drivers/gpu/drm/i915/i915_gem_execbuffer.c |  2 +-
  drivers/gpu/drm/v3d/v3d_gem.c              |  3 ++-
  drivers/gpu/drm/vc4/vc4_gem.c              |  2 +-
  include/drm/drm_syncobj.h                  |  2 +-
  6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 4d3f1a6ee078..ef922e34086e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1151,7 +1151,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], p->fence, 0);
  }
  
  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 3aac0b50a104..6227df2cc0a4 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -141,11 +141,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
   * @fence: fence to install in sync file.
+ * @point: timeline point
   *
- * 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,
-			       struct dma_fence *fence)
+			       struct dma_fence *fence,
+			       u64 point)
  {
  	struct dma_fence *old_fence;
  	struct drm_syncobj_cb *cur, *tmp;
@@ -206,7 +208,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, &fence->base, 0);
  
  	dma_fence_put(&fence->base);
  
@@ -258,7 +260,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, NULL, 0);
  	kfree(syncobj);
  }
  EXPORT_SYMBOL(drm_syncobj_free);
@@ -298,7 +300,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, fence, 0);
  
  	*out_syncobj = syncobj;
  	return 0;
@@ -483,7 +485,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, fence, 0);
  	dma_fence_put(fence);
  	drm_syncobj_put(syncobj);
  	return 0;
@@ -965,7 +967,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], NULL, 0);
  
  	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 60dc2a865f5f..fab3b8fe7a60 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -2211,7 +2211,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, fence, 0);
  	}
  }
  
diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index f6dfb8140a62..f3ec1f18c04c 100644
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -587,7 +587,8 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
  	sync_out = drm_syncobj_find(file_priv, args->out_sync);
  	if (sync_out) {
  		drm_syncobj_replace_fence(sync_out,
-					  &exec->render.base.s_fence->finished);
+					  &exec->render.base.s_fence->finished,
+					  0);
  		drm_syncobj_put(sync_out);
  	}
  
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index f7b4971342e8..68832d66d716 100644
--- 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, exec->fence, 0);
  
  	vc4_update_bo_seqnos(exec, seqno);
  
diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h
index 9962f7a1672c..335ec501001a 100644
--- a/include/drm/drm_syncobj.h
+++ b/include/drm/drm_syncobj.h
@@ -132,7 +132,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,
-			       struct dma_fence *fence);
+			       struct dma_fence *fence, u64 point);

Dito as patch #3, in this case the fence is not the result value but I 
would still use "syncobj, point, fence" like a "classic" array set function.


Apart from that patch #3 and #4 look good to me.

And thanks for doing this, reviewing the driver interface is much easier 
this way,
Christian.

  int drm_syncobj_find_fence(struct drm_file *file_private,
  			   u32 handle,
  			   struct dma_fence **fence, u64 point);

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel







