drm: fix syncobj null_fence_enable_signaling
Subsystems (6)
PATCH 1/5 drm: fix syncobj null_fence_enable_signaling
That is certainly totally nonsense. dma_fence_enable_sw_signaling() is the function who is calling this callback.
--- drivers/gpu/drm/drm_syncobj.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_syncobj.c +0 -1
@@ -184,7 +184,6 @@ static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence)static bool drm_syncobj_null_fence_enable_signaling (struct dma_fence *fence) { -dma_fence_enable_sw_signaling (fence);return !dma_fence_is_signaled (fence); }
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/5 drm: rename null fence to stub fence in syncobj
stub fence will be used by timeline syncobj as well.
--- drivers/gpu/drm/drm_syncobj.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_syncobj.c +10 -10
@@ -172,37 +172,37 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, }EXPORT_SYMBOL (drm_syncobj_replace_fence); -struct drm_syncobj_null_fence { +struct drm_syncobj_stub_fence {struct dma_fence base;spinlock_t lock; }; -static const char *drm_syncobj_null_fence_get_name (struct dma_fence *fence) +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) { -return "syncobjnull" ; +return "syncobjstub" ; } -static bool drm_syncobj_null_fence_enable_signaling (struct dma_fence *fence) +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) {return !dma_fence_is_signaled (fence); } -static const struct dma_fence_ops drm_syncobj_null_fence_ops = { - .get_driver_name = drm_syncobj_null_fence_get_name, - .get_timeline_name = drm_syncobj_null_fence_get_name, - .enable_signaling = drm_syncobj_null_fence_enable_signaling, +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, .release =NULL , };static int drm_syncobj_assign_null_handle (struct drm_syncobj *syncobj) { -struct drm_syncobj_null_fence *fence; +struct drm_syncobj_stub_fence *fence; fence =kzalloc (sizeof (*fence),GFP_KERNEL );if (fence ==NULL )return -ENOMEM ;spin_lock_init (&fence->lock); -dma_fence_init (&fence->base, &drm_syncobj_null_fence_ops, +dma_fence_init (&fence->base, &drm_syncobj_stub_fence_ops, &fence->lock,0 ,0 );dma_fence_signal (&fence->base);
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 2/5] drm: rename null fence to stub fence in syncobj
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 1 line
stub fence will be used by timeline syncobj as well.
Mhm, I'm leaning a bit towards renaming it but "null" fence or "stub" fence doesn't make a large difference to me.
Point is that it is a fence which is always signaled right from the beginning.
So any name which describes that would be welcome.
Christian.
Quoted 49 lines
Signed-off-by Chunming Zhou <[email protected]>Cc Jason Ekstrand <[email protected]>--- drivers/gpu/drm/drm_syncobj.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/drm_syncobj.c +9
-9@@ -172,37 +172,37 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, }EXPORT_SYMBOL (drm_syncobj_replace_fence); -struct drm_syncobj_null_fence { +struct drm_syncobj_stub_fence {struct dma_fence base;spinlock_t lock; }; -static const char *drm_syncobj_null_fence_get_name (struct dma_fence *fence) +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) { -return "syncobjnull" ; +return "syncobjstub" ; } -static bool drm_syncobj_null_fence_enable_signaling (struct dma_fence *fence) +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) {return !dma_fence_is_signaled (fence); } -static const struct dma_fence_ops drm_syncobj_null_fence_ops = { - .get_driver_name = drm_syncobj_null_fence_get_name, - .get_timeline_name = drm_syncobj_null_fence_get_name, - .enable_signaling = drm_syncobj_null_fence_enable_signaling, +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, .release =NULL , };static int drm_syncobj_assign_null_handle (struct drm_syncobj *syncobj) { -struct drm_syncobj_null_fence *fence; +struct drm_syncobj_stub_fence *fence;
drivers/gpu/drm/drm_syncobj.c void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, · line 208
Quoted 10 lines
drivers/gpu/drm/drm_syncobj.c +1
-1fence =kzalloc (sizeof (*fence),GFP_KERNEL );if (fence ==NULL )return -ENOMEM ;spin_lock_init (&fence->lock); -dma_fence_init (&fence->base, &drm_syncobj_null_fence_ops, +dma_fence_init (&fence->base, &drm_syncobj_stub_fence_ops, &fence->lock,0 ,0 );dma_fence_signal (&fence->base);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm: expand drm_syncobj_find_fence to support timeline point
In reply to Chunming Zhouwe can fetch timeline point fence after expanded.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/drm_syncobj.c | 6 ++++-- drivers/gpu/drm/v3d/v3d_gem.c | 4 ++-- drivers/gpu/drm/vc4/vc4_gem.c | 2 +- include/drm/drm_syncobj.h | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
@@ -1062,7 +1062,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, {int r;struct dma_fence *fence; - r =drm_syncobj_find_fence (p->filp, handle, &fence); + r =drm_syncobj_find_fence (p->filp, handle, &fence,0 );if (r)return r;
drivers/gpu/drm/drm_syncobj.c +4 -2
@@ -218,6 +218,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)* @file_private: drm file private pointer * @handle: sync object handle to lookup. * @fence: out parameter for the fence +* @point: timeline point * * This is just a convenience function that combines drm_syncobj_find() and * drm_syncobj_fence_get().
@@ -228,7 +229,8 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)*/ int drm_syncobj_find_fence (struct drm_file *file_private,u32 handle, -struct dma_fence **fence) +struct dma_fence **fence, +u64 point) {struct drm_syncobj *syncobj =drm_syncobj_find (file_private, handle);int ret =0 ;
@@ -498,7 +500,7 @@ static int drm_syncobj_export_sync_file(struct drm_file *file_private,if (fd <0 )return fd; - ret =drm_syncobj_find_fence (file_private, handle, &fence); + ret =drm_syncobj_find_fence (file_private, handle, &fence,0 );if (ret) goto err_put_fd;
drivers/gpu/drm/v3d/v3d_gem.c +2 -2
@@ -521,12 +521,12 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,kref_init (&exec->refcount); ret =drm_syncobj_find_fence (file_priv, args->in_sync_bcl, - &exec->bin.in_fence); + &exec->bin.in_fence,0 );if (ret == -EINVAL ) goto fail; ret =drm_syncobj_find_fence (file_priv, args->in_sync_rcl, - &exec->render.in_fence); + &exec->render.in_fence,0 );if (ret == -EINVAL ) goto fail;
drivers/gpu/drm/vc4/vc4_gem.c +1 -1
@@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,if (args->in_sync) { ret =drm_syncobj_find_fence (file_priv, args->in_sync, - &in_fence); + &in_fence,0 );if (ret) goto fail;
include/drm/drm_syncobj.h +1 -1
@@ -135,7 +135,7 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *fence);int drm_syncobj_find_fence (struct drm_file *file_private,u32 handle, -struct dma_fence **fence); +struct dma_fence **fence,u64 point);void drm_syncobj_free (struct kref *kref);int drm_syncobj_create (struct drm_syncobj **out_syncobj,uint32_t flags,struct dma_fence *fence);
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/5] drm: expand drm_syncobj_find_fence to support timeline point
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 92 lines
we can fetch timeline point fence after expanded.
Signed-off-by Chunming Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/drm_syncobj.c | 6 ++++-- drivers/gpu/drm/v3d/v3d_gem.c | 4 ++-- drivers/gpu/drm/vc4/vc4_gem.c | 2 +- include/drm/drm_syncobj.h | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1
-1@@ -1062,7 +1062,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, {int r;struct dma_fence *fence; - r =drm_syncobj_find_fence (p->filp, handle, &fence); + r =drm_syncobj_find_fence (p->filp, handle, &fence,0 );if (r)return r;drivers/gpu/drm/drm_syncobj.c +4
-2@@ -218,6 +218,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)* @file_private: drm file private pointer * @handle: sync object handle to lookup. * @fence: out parameter for the fence +* @point: timeline point * * This is just a convenience function that combines drm_syncobj_find() and * drm_syncobj_fence_get(). @@ -228,7 +229,8 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)*/ int drm_syncobj_find_fence (struct drm_file *file_private,u32 handle, -struct dma_fence **fence) +struct dma_fence **fence, +u64 point) {struct drm_syncobj *syncobj =drm_syncobj_find (file_private, handle);int ret =0 ;@@ -498,7 +500,7 @@ static int drm_syncobj_export_sync_file(struct drm_file *file_private,if (fd <0 )return fd; - ret =drm_syncobj_find_fence (file_private, handle, &fence); + ret =drm_syncobj_find_fence (file_private, handle, &fence,0 );if (ret) goto err_put_fd;drivers/gpu/drm/v3d/v3d_gem.c +2
-2@@ -521,12 +521,12 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,kref_init (&exec->refcount); ret =drm_syncobj_find_fence (file_priv, args->in_sync_bcl, - &exec->bin.in_fence); + &exec->bin.in_fence,0 );if (ret == -EINVAL ) goto fail; ret =drm_syncobj_find_fence (file_priv, args->in_sync_rcl, - &exec->render.in_fence); + &exec->render.in_fence,0 );if (ret == -EINVAL ) goto fail;drivers/gpu/drm/vc4/vc4_gem.c +1
-1@@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,if (args->in_sync) { ret =drm_syncobj_find_fence (file_priv, args->in_sync, - &in_fence); + &in_fence,0 );if (ret) goto fail;include/drm/drm_syncobj.h +0
-0
include/drm/drm_syncobj.h void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, · line 138
Quoted 5 lines
include/drm/drm_syncobj.h +1
-1@@ -135,7 +135,7 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *fence);int drm_syncobj_find_fence (struct drm_file *file_private,u32 handle, -struct dma_fence **fence); +struct dma_fence **fence,u64 point);
The fence is the result of the function and should come last.
Christian.
include/drm/drm_syncobj.h void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, · line 141
Quoted 3 lines
include/drm/drm_syncobj.h +0
-0void drm_syncobj_free (struct kref *kref);int drm_syncobj_create (struct drm_syncobj **out_syncobj,uint32_t flags,struct dma_fence *fence);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/5 drm: expand replace_fence to support timeline point
In reply to Chunming Zhouwe can place a fence to a timeline point after expanded.
--- 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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
@@ -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,
drivers/gpu/drm/drm_syncobj.c +9 -7
@@ -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);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -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 ); } }
drivers/gpu/drm/v3d/v3d_gem.c +2 -1
@@ -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); }
drivers/gpu/drm/vc4/vc4_gem.c +1 -1
@@ -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);
include/drm/drm_syncobj.h +1 -1
@@ -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);int drm_syncobj_find_fence (struct drm_file *file_private,u32 handle,struct dma_fence **fence,u64 point);
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 4/5] drm: expand replace_fence to support timeline point
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 135 lines
we can place a fence to a timeline point after expanded.
Signed-off-by Chunming Zhou <[email protected]>--- 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(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1
-1@@ -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,drivers/gpu/drm/drm_syncobj.c +9
-7@@ -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);drivers/gpu/drm/i915/i915_gem_execbuffer.c +1
-1@@ -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 ); } }drivers/gpu/drm/v3d/v3d_gem.c +2
-1@@ -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); }drivers/gpu/drm/vc4/vc4_gem.c +1
-1@@ -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);include/drm/drm_syncobj.h +0
-0
include/drm/drm_syncobj.h drm_syncobj_fence_get(struct drm_syncobj *syncobj) · line 135
Quoted 5 lines
include/drm/drm_syncobj.h +1
-1@@ -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.
include/drm/drm_syncobj.h drm_syncobj_fence_get(struct drm_syncobj *syncobj) · line 138
Quoted 3 lines
include/drm/drm_syncobj.h +0
-0int drm_syncobj_find_fence (struct drm_file *file_private,u32 handle,struct dma_fence **fence,u64 point);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 5/5 drm: add syncobj timeline support v2
VK_KHR_timeline_semaphore:
This extension introduces a new type of semaphore that has an integer payload identifying a point in a timeline. Such timeline semaphores support the following operations:
* Host query - A host operation that allows querying the payload of the timeline semaphore.
* Host wait - A host operation that allows a blocking wait for a timeline semaphore to reach a specified value.
* Device wait - A device operation that allows waiting for a timeline semaphore to reach a specified value.
* Device signal - A device operation that allows advancing the timeline semaphore to a specified value.
Since it's a timeline, that means the front time point(PT) always is signaled before the late PT. a. signal PT design:
Signal PT fence N depends on PT[N-1] fence and signal opertion fence, when PT[N] fence is signaled, the timeline will increase to value of PT[N].
b. wait PT design:
Wait PT fence is signaled by reaching timeline point value, when timeline is increasing, will compare wait PTs value with new timeline value, if PT value is lower than timeline value, then wait PT will be signaled, otherwise keep in list. semaphore wait operation can wait on any point of timeline, so need a RB tree to order them. And wait PT could ahead of signal PT, we need a sumission fence to perform that.
v2:
1. remove unused DRM_SYNCOBJ_CREATE_TYPE_NORMAL. (Christian)
2. move unexposed denitions to .c file. (Daniel Vetter)
3. split up the change to drm_syncobj_find_fence() in a separate patch. (Christian)
4. split up the change to drm_syncobj_replace_fence() in a separate patch.
5. drop the submission_fence implementation and instead use wait_event() for that. (Christian)
6. WARN_ON(point != 0) for NORMAL type syncobj case. (Daniel Vetter)
TODO:
1. CPU query and wait on timeline semaphore.
2. test application (Daniel Vetter)
--- drivers/gpu/drm/drm_syncobj.c | 383 +++++++++++++++++++++++++++++++++++++++--- include/drm/drm_syncobj.h | 28 +++ include/uapi/drm/drm.h | 1 + 3 files changed, 389 insertions(+), 23 deletions(-)
drivers/gpu/drm/drm_syncobj.c +360 -23
@@ -56,6 +56,44 @@#include "drm_internal.h" #include <drm/drm_syncobj.h> +struct drm_syncobj_stub_fence { +struct dma_fence base; +spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) +{ +return "syncobjstub" ; +} + +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) +{ +return !dma_fence_is_signaled (fence); +} + +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, + .release =NULL , +}; + +struct drm_syncobj_wait_pt { +struct drm_syncobj_stub_fence base; +u64 value; +struct rb_node node; +}; +struct drm_syncobj_signal_pt { +struct drm_syncobj_stub_fence base; +struct dma_fence *signal_fence; +struct dma_fence *pre_pt_base; +struct dma_fence_cb signal_cb; +struct dma_fence_cb pre_pt_cb; +struct drm_syncobj *syncobj; +u64 value; +struct list_head list; +}; +/** * drm_syncobj_find - lookup and reference a sync object. * @file_private: drm file private pointer
@@ -137,6 +175,150 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj,spin_unlock (&syncobj->lock); } +static void drm_syncobj_timeline_signal_wait_pts (struct drm_syncobj *syncobj) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj->syncobj_timeline.wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +if (wait_pt->value <= syncobj->syncobj_timeline.timeline) { +dma_fence_signal (&wait_pt->base.base); +rb_erase (&wait_pt->node, + &syncobj->syncobj_timeline.wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + }else { +/* the loop is from left to right, the later entry value is +* bigger, so don't need to check any more */ +break ; + } + } +spin_unlock (&syncobj->lock); +} + + +static void pt_fence_cb (struct drm_syncobj_signal_pt *signal_pt) +{ +struct dma_fence *fence =NULL ; +struct drm_syncobj *syncobj; + + fence = signal_pt->signal_fence; + signal_pt->signal_fence =NULL ; +dma_fence_put (fence); + fence = signal_pt->pre_pt_base; + signal_pt->pre_pt_base =NULL ; +dma_fence_put (fence); + + syncobj = signal_pt->syncobj; +spin_lock (&syncobj->lock); +list_del (&signal_pt->list); + syncobj->syncobj_timeline.timeline = signal_pt->value; +spin_unlock (&syncobj->lock); +/* kfree(signal_pt) will be executed by below fence put */ +dma_fence_put (&signal_pt->base.base); +drm_syncobj_timeline_signal_wait_pts (syncobj); +} +static void pt_signal_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, signal_cb); + +if (signal_pt->pre_pt_base && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} +static void pt_pre_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, pre_pt_cb); + +if (signal_pt->signal_fence && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} + +static int drm_syncobj_timeline_replace_fence (struct drm_syncobj *syncobj, +struct dma_fence *fence, +u64 point) +{ +struct drm_syncobj_signal_pt *signal_pt = +kzalloc (sizeof (struct drm_syncobj_signal_pt ),GFP_KERNEL ); +struct drm_syncobj_signal_pt *tail_pt; +struct dma_fence *tail_pt_fence =NULL ; +int ret =0 ; + +if (!signal_pt) +return -ENOMEM ; +if (syncobj->syncobj_timeline.signal_point >= point) { +DRM_WARN ("A later signal is ready!" ); + goto out; + } +if (fence) +dma_fence_get (fence); +spin_lock (&syncobj->lock); +spin_lock_init (&signal_pt->base.lock); +dma_fence_init (&signal_pt->base.base, + &drm_syncobj_stub_fence_ops, + &signal_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + signal_pt->signal_fence = +rcu_dereference_protected (fence, +lockdep_is_held (&fence->lock)); +if (!list_empty (&syncobj->syncobj_timeline.signal_pt_list)) { + tail_pt =list_last_entry (&syncobj->syncobj_timeline.signal_pt_list, + struct drm_syncobj_signal_pt, list); + tail_pt_fence = &tail_pt->base.base; +if (dma_fence_is_signaled (tail_pt_fence)) + tail_pt_fence =NULL ; + } +if (tail_pt_fence) + signal_pt->pre_pt_base = +dma_fence_get (rcu_dereference_protected (tail_pt_fence, +lockdep_is_held (&tail_pt_fence->lock))); + + signal_pt->value = point; + syncobj->syncobj_timeline.signal_point = point; + signal_pt->syncobj = syncobj; +INIT_LIST_HEAD (&signal_pt->list); +list_add_tail (&signal_pt->list, &syncobj->syncobj_timeline.signal_pt_list); +spin_unlock (&syncobj->lock); +wake_up_all (&syncobj->syncobj_timeline.wq); +/** +* Every pt is depending on signal fence and previous pt fence, add +* callbacks to them +*/ +if (!dma_fence_is_signaled (signal_pt->signal_fence)) +dma_fence_add_callback (signal_pt->signal_fence, + &signal_pt->signal_cb, + pt_signal_fence_func); +else +pt_signal_fence_func (signal_pt->signal_fence, + &signal_pt->signal_cb); +if (signal_pt->pre_pt_base && !dma_fence_is_signaled (signal_pt->pre_pt_base)) +dma_fence_add_callback (signal_pt->pre_pt_base, + &signal_pt->pre_pt_cb, + pt_pre_fence_func); +else +pt_pre_fence_func (signal_pt->pre_pt_base, &signal_pt->pre_pt_cb); + + +return 0 ; +out: +kfree (signal_pt); +return ret; +} +/** * drm_syncobj_replace_fence - replace fence in a sync object. * @syncobj: Sync object to replace fence in
@@ -152,6 +334,11 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,struct dma_fence *old_fence;struct drm_syncobj_cb *cur, *tmp; +if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { +drm_syncobj_timeline_replace_fence (syncobj, fence, + point); +return ; + }if (fence)dma_fence_get (fence);
@@ -174,28 +361,6 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, }EXPORT_SYMBOL (drm_syncobj_replace_fence); -struct drm_syncobj_stub_fence { -struct dma_fence base; -spinlock_t lock; -}; - -static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) -{ -return "syncobjstub" ; -} - -static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) -{ -return !dma_fence_is_signaled (fence); -} - -static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { - .get_driver_name = drm_syncobj_stub_fence_get_name, - .get_timeline_name = drm_syncobj_stub_fence_get_name, - .enable_signaling = drm_syncobj_stub_fence_enable_signaling, - .release =NULL , -}; -static int drm_syncobj_assign_null_handle (struct drm_syncobj *syncobj) {struct drm_syncobj_stub_fence *fence;
@@ -215,6 +380,121 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)return 0 ; } +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_lookup_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct rb_node *node = syncobj->syncobj_timeline.wait_pt_tree.rb_node; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + + +spin_lock (&syncobj->lock); +while (node) { +int result = point - wait_pt->value; + + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); +if (result <0 ) + node = node->rb_left; +else if (result >0 ) + node = node->rb_right; +else +break ; + } +spin_unlock (&syncobj->lock); + +return wait_pt; +} + +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_create_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct drm_syncobj_wait_pt *wait_pt; +struct rb_node **new = &(syncobj->syncobj_timeline.wait_pt_tree.rb_node), *parent =NULL ; + + wait_pt =kzalloc (sizeof (*wait_pt),GFP_KERNEL ); +if (!wait_pt) +return NULL ; +spin_lock_init (&wait_pt->base.lock); +dma_fence_init (&wait_pt->base.base, + &drm_syncobj_stub_fence_ops, + &wait_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + wait_pt->value = point; + +/* wait pt must be in an order, so that we can easily lookup and signal +* it */ +spin_lock (&syncobj->lock); +if (point <= syncobj->syncobj_timeline.timeline) +dma_fence_signal (&wait_pt->base.base); +while (*new) { +struct drm_syncobj_wait_pt *this = + rb_entry(*new, struct drm_syncobj_wait_pt, node); +int result = wait_pt->value - this->value; + + parent = *new; +if (result <0 ) + new = &((*new)->rb_left); +else if (result >0 ) + new = &((*new)->rb_right); +else + goto exist; + } + +rb_link_node (&wait_pt->node, parent, new); +rb_insert_color (&wait_pt->node, &syncobj->syncobj_timeline.wait_pt_tree); +spin_unlock (&syncobj->lock); +return wait_pt; +exist: +spin_unlock (&syncobj->lock); +dma_fence_put (&wait_pt->base.base); + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +return wait_pt; +} + +static struct dma_fence * +drm_syncobj_timeline_point_get (struct drm_syncobj *syncobj,u64 point,u64 flag) +{ +struct drm_syncobj_wait_pt *wait_pt; + +/* already signaled, simply return a signaled stub fence */ +if (point <= syncobj->syncobj_timeline.timeline) { +struct drm_syncobj_stub_fence *fence; + + fence =kzalloc (sizeof (*fence),GFP_KERNEL ); +if (fence ==NULL ) +return NULL ; + +spin_lock_init (&fence->lock); +dma_fence_init (&fence->base, &drm_syncobj_stub_fence_ops, + &fence->lock,0 ,0 ); +dma_fence_signal (&fence->base); +return &fence->base; + } + +/* check if the wait pt exists */ + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +if (!wait_pt) { +/* This is a new wait pt, so create it */ + wait_pt =drm_syncobj_timeline_create_wait_pt (syncobj, point); +if (!wait_pt) +return NULL ; + } +if (wait_pt) { +struct dma_fence *fence; +int ret = +wait_event_interruptible_timeout (syncobj->syncobj_timeline.wq, + wait_pt->value <= syncobj->syncobj_timeline.signal_point, +msecs_to_jiffies (10000 ));/* wait 10s */ + +if (ret <=0 ) +return NULL ; +rcu_read_lock (); + fence =dma_fence_get_rcu (&wait_pt->base.base); +rcu_read_unlock (); +return fence; + } +return NULL ; +} +/** * drm_syncobj_find_fence - lookup and reference the fence in a sync object * @file_private: drm file private pointer
@@ -240,7 +520,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private,if (!syncobj)return -ENOENT ; - *fence =drm_syncobj_fence_get (syncobj); +if (syncobj->type ==DRM_SYNCOBJ_TYPE_NORMAL ) { +/* NORMAL syncobj doesn't care point value */ +WARN_ON (point !=0 ); + *fence =drm_syncobj_fence_get (syncobj); + }else if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { + *fence =drm_syncobj_timeline_point_get (syncobj, point, +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ); + }else { +DRM_ERROR ("Don't support this type syncobj\n" ); + *fence =NULL ; + }if (!*fence) { ret = -EINVAL ; }
@@ -249,6 +539,34 @@ int drm_syncobj_find_fence(struct drm_file *file_private, }EXPORT_SYMBOL (drm_syncobj_find_fence); +static void drm_syncobj_timeline_fini (struct drm_syncobj *syncobj, +struct drm_syncobj_timeline *syncobj_timeline) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; +struct drm_syncobj_signal_pt *signal_pt =NULL , *tmp; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj_timeline->wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +rb_erase (&wait_pt->node, + &syncobj_timeline->wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + } +list_for_each_entry_safe (signal_pt, tmp, + &syncobj_timeline->signal_pt_list, list) { +list_del (&signal_pt->list); +dma_fence_put (signal_pt->signal_fence); +dma_fence_put (signal_pt->pre_pt_base); +dma_fence_put (&signal_pt->base.base); + } +spin_unlock (&syncobj->lock); +} +/** * drm_syncobj_free - free a sync object. * @kref: kref to free.
@@ -261,10 +579,23 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj, refcount);drm_syncobj_replace_fence (syncobj,NULL ,0 ); +drm_syncobj_timeline_fini (syncobj, &syncobj->syncobj_timeline);kfree (syncobj); }EXPORT_SYMBOL (drm_syncobj_free); +static void drm_syncobj_timeline_init (struct drm_syncobj_timeline + *syncobj_timeline) +{ + syncobj_timeline->timeline_context =dma_fence_context_alloc (1 ); + syncobj_timeline->timeline =0 ; + syncobj_timeline->signal_point =0 ; +init_waitqueue_head (&syncobj_timeline->wq); + + syncobj_timeline->wait_pt_tree =RB_ROOT ; +INIT_LIST_HEAD (&syncobj_timeline->signal_pt_list); +} +/** * drm_syncobj_create - create a new syncobj * @out_syncobj: returned syncobj
@@ -290,6 +621,12 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,kref_init (&syncobj->refcount);INIT_LIST_HEAD (&syncobj->cb_list);spin_lock_init (&syncobj->lock); +if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE ) { + syncobj->type =DRM_SYNCOBJ_TYPE_TIMELINE ; +drm_syncobj_timeline_init (&syncobj->syncobj_timeline); + }else { + syncobj->type =DRM_SYNCOBJ_TYPE_NORMAL ; + }if (flags &DRM_SYNCOBJ_CREATE_SIGNALED ) { ret =drm_syncobj_assign_null_handle (syncobj);
include/drm/drm_syncobj.h +28 -0
@@ -30,6 +30,25 @@struct drm_syncobj_cb ; +enum drm_syncobj_type { +DRM_SYNCOBJ_TYPE_NORMAL , +DRM_SYNCOBJ_TYPE_TIMELINE +}; + +struct drm_syncobj_timeline { +wait_queue_head_t wq; +u64 timeline_context; +/** +* @timeline: syncobj timeline +*/ +u64 timeline; +u64 signal_point; + + +struct rb_root wait_pt_tree; +struct list_head signal_pt_list; +}; +/** * struct drm_syncobj - sync object. *
@@ -40,6 +59,15 @@ struct drm_syncobj {* @refcount: Reference count of this object. */ struct kref refcount; +/** +* @type: indicate syncobj type +*/ +enum drm_syncobj_type type; +/** +* @syncobj_timeline: timeline +*/ +struct drm_syncobj_timeline syncobj_timeline; +/** * @fence: * NULL or a pointer to the fence bound to this object.
include/uapi/drm/drm.h +1 -0
@@ -717,6 +717,7 @@ struct drm_prime_handle {struct drm_syncobj_create {__u32 handle;#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)__u32 flags; };
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 5/5] drm: add syncobj timeline support v2
Quoted 24 lines · Chunming Zhou
VK_KHR_timeline_semaphore:
This extension introduces a new type of semaphore that has an integer payload identifying a point in a timeline. Such timeline semaphores support the following operations:
* Host query - A host operation that allows querying the payload of the timeline semaphore.
* Host wait - A host operation that allows a blocking wait for a timeline semaphore to reach a specified value.
* Device wait - A device operation that allows waiting for a timeline semaphore to reach a specified value.
* Device signal - A device operation that allows advancing the timeline semaphore to a specified value.Since it's a timeline, that means the front time point(PT) always is signaled before the late PT. a. signal PT design:
Signal PT fence N depends on PT[N-1] fence and signal opertion fence, when PT[N] fence is signaled, the timeline will increase to value of PT[N].
b. wait PT design:
Wait PT fence is signaled by reaching timeline point value, when timeline is increasing, will compare wait PTs value with new timeline value, if PT value is lower than timeline value, then wait PT will be signaled, otherwise keep in list. semaphore wait operation can wait on any point of timeline, so need a RB tree to order them. And wait PT could ahead of signal PT, we need a sumission fence to perform that.
Quoted 7 lines
v2:
1. remove unusedDRM_SYNCOBJ_CREATE_TYPE_NORMAL. (Christian)
2. move unexposed denitions to .c file. (Daniel Vetter)
3. split up the change todrm_syncobj_find_fence()in a separate patch. (Christian)
4. split up the change todrm_syncobj_replace_fence()in a separate patch.
5. drop thesubmission_fenceimplementation and instead usewait_event()for that. (Christian)
6.WARN_ON(point != 0)for NORMAL type syncobj case. (Daniel Vetter)
Depending upon how it's going to be used, this is the wrong thing to do.
Quoted 3 lines
TODO:
1. CPU query and wait on timeline semaphore.
2. test application (Daniel Vetter)
I also had some more suggestions, around aligning the two concepts of future fences and at least trying to merge the timeline and the other fence (which really is just a special case of a timeline with only 1 slot).
-Daniel
Quoted 527 lines
Signed-off-by Chunming Zhou <[email protected]>Cc Christian Konig <[email protected]>Cc Dave Airlie <[email protected]>Cc Daniel Rakos <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_syncobj.c | 383 +++++++++++++++++++++++++++++++++++++++--- include/drm/drm_syncobj.h | 28 +++ include/uapi/drm/drm.h | 1 + 3 files changed, 389 insertions(+), 23 deletions(-)drivers/gpu/drm/drm_syncobj.c +360
-23@@ -56,6 +56,44 @@#include "drm_internal.h" #include <drm/drm_syncobj.h> +struct drm_syncobj_stub_fence { +struct dma_fence base; +spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) +{ +return "syncobjstub" ; +} + +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) +{ +return !dma_fence_is_signaled (fence); +} + +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, + .release =NULL , +}; + +struct drm_syncobj_wait_pt { +struct drm_syncobj_stub_fence base; +u64 value; +struct rb_node node; +}; +struct drm_syncobj_signal_pt { +struct drm_syncobj_stub_fence base; +struct dma_fence *signal_fence; +struct dma_fence *pre_pt_base; +struct dma_fence_cb signal_cb; +struct dma_fence_cb pre_pt_cb; +struct drm_syncobj *syncobj; +u64 value; +struct list_head list; +}; +/** * drm_syncobj_find - lookup and reference a sync object. * @file_private: drm file private pointer @@ -137,6 +175,150 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj,spin_unlock (&syncobj->lock); } +static void drm_syncobj_timeline_signal_wait_pts (struct drm_syncobj *syncobj) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj->syncobj_timeline.wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +if (wait_pt->value <= syncobj->syncobj_timeline.timeline) { +dma_fence_signal (&wait_pt->base.base); +rb_erase (&wait_pt->node, + &syncobj->syncobj_timeline.wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + }else { +/* the loop is from left to right, the later entry value is +* bigger, so don't need to check any more */ +break ; + } + } +spin_unlock (&syncobj->lock); +} + + +static void pt_fence_cb (struct drm_syncobj_signal_pt *signal_pt) +{ +struct dma_fence *fence =NULL ; +struct drm_syncobj *syncobj; + + fence = signal_pt->signal_fence; + signal_pt->signal_fence =NULL ; +dma_fence_put (fence); + fence = signal_pt->pre_pt_base; + signal_pt->pre_pt_base =NULL ; +dma_fence_put (fence); + + syncobj = signal_pt->syncobj; +spin_lock (&syncobj->lock); +list_del (&signal_pt->list); + syncobj->syncobj_timeline.timeline = signal_pt->value; +spin_unlock (&syncobj->lock); +/* kfree(signal_pt) will be executed by below fence put */ +dma_fence_put (&signal_pt->base.base); +drm_syncobj_timeline_signal_wait_pts (syncobj); +} +static void pt_signal_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, signal_cb); + +if (signal_pt->pre_pt_base && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} +static void pt_pre_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, pre_pt_cb); + +if (signal_pt->signal_fence && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} + +static int drm_syncobj_timeline_replace_fence (struct drm_syncobj *syncobj, +struct dma_fence *fence, +u64 point) +{ +struct drm_syncobj_signal_pt *signal_pt = +kzalloc (sizeof (struct drm_syncobj_signal_pt ),GFP_KERNEL ); +struct drm_syncobj_signal_pt *tail_pt; +struct dma_fence *tail_pt_fence =NULL ; +int ret =0 ; + +if (!signal_pt) +return -ENOMEM ; +if (syncobj->syncobj_timeline.signal_point >= point) { +DRM_WARN ("A later signal is ready!" ); + goto out; + } +if (fence) +dma_fence_get (fence); +spin_lock (&syncobj->lock); +spin_lock_init (&signal_pt->base.lock); +dma_fence_init (&signal_pt->base.base, + &drm_syncobj_stub_fence_ops, + &signal_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + signal_pt->signal_fence = +rcu_dereference_protected (fence, +lockdep_is_held (&fence->lock)); +if (!list_empty (&syncobj->syncobj_timeline.signal_pt_list)) { + tail_pt =list_last_entry (&syncobj->syncobj_timeline.signal_pt_list, + struct drm_syncobj_signal_pt, list); + tail_pt_fence = &tail_pt->base.base; +if (dma_fence_is_signaled (tail_pt_fence)) + tail_pt_fence =NULL ; + } +if (tail_pt_fence) + signal_pt->pre_pt_base = +dma_fence_get (rcu_dereference_protected (tail_pt_fence, +lockdep_is_held (&tail_pt_fence->lock))); + + signal_pt->value = point; + syncobj->syncobj_timeline.signal_point = point; + signal_pt->syncobj = syncobj; +INIT_LIST_HEAD (&signal_pt->list); +list_add_tail (&signal_pt->list, &syncobj->syncobj_timeline.signal_pt_list); +spin_unlock (&syncobj->lock); +wake_up_all (&syncobj->syncobj_timeline.wq); +/** +* Every pt is depending on signal fence and previous pt fence, add +* callbacks to them +*/ +if (!dma_fence_is_signaled (signal_pt->signal_fence)) +dma_fence_add_callback (signal_pt->signal_fence, + &signal_pt->signal_cb, + pt_signal_fence_func); +else +pt_signal_fence_func (signal_pt->signal_fence, + &signal_pt->signal_cb); +if (signal_pt->pre_pt_base && !dma_fence_is_signaled (signal_pt->pre_pt_base)) +dma_fence_add_callback (signal_pt->pre_pt_base, + &signal_pt->pre_pt_cb, + pt_pre_fence_func); +else +pt_pre_fence_func (signal_pt->pre_pt_base, &signal_pt->pre_pt_cb); + + +return 0 ; +out: +kfree (signal_pt); +return ret; +} +/** * drm_syncobj_replace_fence - replace fence in a sync object. * @syncobj: Sync object to replace fence in @@ -152,6 +334,11 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,struct dma_fence *old_fence;struct drm_syncobj_cb *cur, *tmp; +if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { +drm_syncobj_timeline_replace_fence (syncobj, fence, + point); +return ; + }if (fence)dma_fence_get (fence);@@ -174,28 +361,6 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, }EXPORT_SYMBOL (drm_syncobj_replace_fence); -struct drm_syncobj_stub_fence { -struct dma_fence base; -spinlock_t lock; -}; - -static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) -{ -return "syncobjstub" ; -} - -static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) -{ -return !dma_fence_is_signaled (fence); -} - -static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { - .get_driver_name = drm_syncobj_stub_fence_get_name, - .get_timeline_name = drm_syncobj_stub_fence_get_name, - .enable_signaling = drm_syncobj_stub_fence_enable_signaling, - .release =NULL , -}; -static int drm_syncobj_assign_null_handle (struct drm_syncobj *syncobj) {struct drm_syncobj_stub_fence *fence;@@ -215,6 +380,121 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)return 0 ; } +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_lookup_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct rb_node *node = syncobj->syncobj_timeline.wait_pt_tree.rb_node; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + + +spin_lock (&syncobj->lock); +while (node) { +int result = point - wait_pt->value; + + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); +if (result <0 ) + node = node->rb_left; +else if (result >0 ) + node = node->rb_right; +else +break ; + } +spin_unlock (&syncobj->lock); + +return wait_pt; +} + +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_create_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct drm_syncobj_wait_pt *wait_pt; +struct rb_node **new = &(syncobj->syncobj_timeline.wait_pt_tree.rb_node), *parent =NULL ; + + wait_pt =kzalloc (sizeof (*wait_pt),GFP_KERNEL ); +if (!wait_pt) +return NULL ; +spin_lock_init (&wait_pt->base.lock); +dma_fence_init (&wait_pt->base.base, + &drm_syncobj_stub_fence_ops, + &wait_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + wait_pt->value = point; + +/* wait pt must be in an order, so that we can easily lookup and signal +* it */ +spin_lock (&syncobj->lock); +if (point <= syncobj->syncobj_timeline.timeline) +dma_fence_signal (&wait_pt->base.base); +while (*new) { +struct drm_syncobj_wait_pt *this = + rb_entry(*new, struct drm_syncobj_wait_pt, node); +int result = wait_pt->value - this->value; + + parent = *new; +if (result <0 ) + new = &((*new)->rb_left); +else if (result >0 ) + new = &((*new)->rb_right); +else + goto exist; + } + +rb_link_node (&wait_pt->node, parent, new); +rb_insert_color (&wait_pt->node, &syncobj->syncobj_timeline.wait_pt_tree); +spin_unlock (&syncobj->lock); +return wait_pt; +exist: +spin_unlock (&syncobj->lock); +dma_fence_put (&wait_pt->base.base); + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +return wait_pt; +} + +static struct dma_fence * +drm_syncobj_timeline_point_get (struct drm_syncobj *syncobj,u64 point,u64 flag) +{ +struct drm_syncobj_wait_pt *wait_pt; + +/* already signaled, simply return a signaled stub fence */ +if (point <= syncobj->syncobj_timeline.timeline) { +struct drm_syncobj_stub_fence *fence; + + fence =kzalloc (sizeof (*fence),GFP_KERNEL ); +if (fence ==NULL ) +return NULL ; + +spin_lock_init (&fence->lock); +dma_fence_init (&fence->base, &drm_syncobj_stub_fence_ops, + &fence->lock,0 ,0 ); +dma_fence_signal (&fence->base); +return &fence->base; + } + +/* check if the wait pt exists */ + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +if (!wait_pt) { +/* This is a new wait pt, so create it */ + wait_pt =drm_syncobj_timeline_create_wait_pt (syncobj, point); +if (!wait_pt) +return NULL ; + } +if (wait_pt) { +struct dma_fence *fence; +int ret = +wait_event_interruptible_timeout (syncobj->syncobj_timeline.wq, + wait_pt->value <= syncobj->syncobj_timeline.signal_point, +msecs_to_jiffies (10000 ));/* wait 10s */ + +if (ret <=0 ) +return NULL ; +rcu_read_lock (); + fence =dma_fence_get_rcu (&wait_pt->base.base); +rcu_read_unlock (); +return fence; + } +return NULL ; +} +/** * drm_syncobj_find_fence - lookup and reference the fence in a sync object * @file_private: drm file private pointer @@ -240,7 +520,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private,if (!syncobj)return -ENOENT ; - *fence =drm_syncobj_fence_get (syncobj); +if (syncobj->type ==DRM_SYNCOBJ_TYPE_NORMAL ) { +/* NORMAL syncobj doesn't care point value */ +WARN_ON (point !=0 ); + *fence =drm_syncobj_fence_get (syncobj); + }else if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { + *fence =drm_syncobj_timeline_point_get (syncobj, point, +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ); + }else { +DRM_ERROR ("Don't support this type syncobj\n" ); + *fence =NULL ; + }if (!*fence) { ret = -EINVAL ; }@@ -249,6 +539,34 @@ int drm_syncobj_find_fence(struct drm_file *file_private, }EXPORT_SYMBOL (drm_syncobj_find_fence); +static void drm_syncobj_timeline_fini (struct drm_syncobj *syncobj, +struct drm_syncobj_timeline *syncobj_timeline) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; +struct drm_syncobj_signal_pt *signal_pt =NULL , *tmp; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj_timeline->wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +rb_erase (&wait_pt->node, + &syncobj_timeline->wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + } +list_for_each_entry_safe (signal_pt, tmp, + &syncobj_timeline->signal_pt_list, list) { +list_del (&signal_pt->list); +dma_fence_put (signal_pt->signal_fence); +dma_fence_put (signal_pt->pre_pt_base); +dma_fence_put (&signal_pt->base.base); + } +spin_unlock (&syncobj->lock); +} +/** * drm_syncobj_free - free a sync object. * @kref: kref to free. @@ -261,10 +579,23 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj, refcount);drm_syncobj_replace_fence (syncobj,NULL ,0 ); +drm_syncobj_timeline_fini (syncobj, &syncobj->syncobj_timeline);kfree (syncobj); }EXPORT_SYMBOL (drm_syncobj_free); +static void drm_syncobj_timeline_init (struct drm_syncobj_timeline + *syncobj_timeline) +{ + syncobj_timeline->timeline_context =dma_fence_context_alloc (1 ); + syncobj_timeline->timeline =0 ; + syncobj_timeline->signal_point =0 ; +init_waitqueue_head (&syncobj_timeline->wq); + + syncobj_timeline->wait_pt_tree =RB_ROOT ; +INIT_LIST_HEAD (&syncobj_timeline->signal_pt_list); +} +/** * drm_syncobj_create - create a new syncobj * @out_syncobj: returned syncobj @@ -290,6 +621,12 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,kref_init (&syncobj->refcount);INIT_LIST_HEAD (&syncobj->cb_list);spin_lock_init (&syncobj->lock); +if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE ) { + syncobj->type =DRM_SYNCOBJ_TYPE_TIMELINE ; +drm_syncobj_timeline_init (&syncobj->syncobj_timeline); + }else { + syncobj->type =DRM_SYNCOBJ_TYPE_NORMAL ; + }if (flags &DRM_SYNCOBJ_CREATE_SIGNALED ) { ret =drm_syncobj_assign_null_handle (syncobj);include/drm/drm_syncobj.h +28
-0@@ -30,6 +30,25 @@struct drm_syncobj_cb ; +enum drm_syncobj_type { +DRM_SYNCOBJ_TYPE_NORMAL , +DRM_SYNCOBJ_TYPE_TIMELINE +}; + +struct drm_syncobj_timeline { +wait_queue_head_t wq; +u64 timeline_context; +/** +* @timeline: syncobj timeline +*/ +u64 timeline; +u64 signal_point; + + +struct rb_root wait_pt_tree; +struct list_head signal_pt_list; +}; +/** * struct drm_syncobj - sync object. * @@ -40,6 +59,15 @@ struct drm_syncobj {* @refcount: Reference count of this object. */ struct kref refcount; +/** +* @type: indicate syncobj type +*/ +enum drm_syncobj_type type; +/** +* @syncobj_timeline: timeline +*/ +struct drm_syncobj_timeline syncobj_timeline; +/** * @fence: * NULL or a pointer to the fence bound to this object. include/uapi/drm/drm.h +1
-0@@ -717,6 +717,7 @@ struct drm_prime_handle {struct drm_syncobj_create {__u32 handle;#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)__u32 flags; };Signature · 1 line
2.14.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180823090819.GA21634-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org
Re: [PATCH 5/5] drm: add syncobj timeline support v2
Quoted 32 lines · Daniel Vetter
Quoted 24 lines · Chunming Zhou
VK_KHR_timeline_semaphore:
This extension introduces a new type of semaphore that has an integer payload identifying a point in a timeline. Such timeline semaphores support the following operations:
* Host query - A host operation that allows querying the payload of the timeline semaphore.
* Host wait - A host operation that allows a blocking wait for a timeline semaphore to reach a specified value.
* Device wait - A device operation that allows waiting for a timeline semaphore to reach a specified value.
* Device signal - A device operation that allows advancing the timeline semaphore to a specified value.Since it's a timeline, that means the front time point(PT) always is signaled before the late PT. a. signal PT design:
Signal PT fence N depends on PT[N-1] fence and signal opertion fence, when PT[N] fence is signaled, the timeline will increase to value of PT[N].
b. wait PT design:
Wait PT fence is signaled by reaching timeline point value, when timeline is increasing, will compare wait PTs value with new timeline value, if PT value is lower than timeline value, then wait PT will be signaled, otherwise keep in list. semaphore wait operation can wait on any point of timeline, so need a RB tree to order them. And wait PT could ahead of signal PT, we need a sumission fence to perform that.Quoted 7 lines
v2:
1. remove unusedDRM_SYNCOBJ_CREATE_TYPE_NORMAL. (Christian)
2. move unexposed denitions to .c file. (Daniel Vetter)
3. split up the change todrm_syncobj_find_fence()in a separate patch. (Christian)
4. split up the change todrm_syncobj_replace_fence()in a separate patch.
5. drop thesubmission_fenceimplementation and instead usewait_event()for that. (Christian)
6.WARN_ON(point != 0)for NORMAL type syncobj case. (Daniel Vetter)
Quoted 7 lines
Depending upon how it's going to be used, this is the wrong thing to do.
Quoted 3 lines
TODO:
1. CPU query and wait on timeline semaphore.
2. test application (Daniel Vetter)I also had some more suggestions, around aligning the two concepts of future fences
submission fence is replaced by wait_event, so I don't address your future fence suggestion. And welcome to explain future fence status.
Quoted 3 lines
and at least trying to merge the timeline and the other fence (which really is just a special case of a timeline with only 1 slot).
Could you detail that? Do you mean merge syncobj->fence to timeline point?
Thanks,
David Zhou
Quoted 525 lines
-Daniel
Quoted 523 lines
Signed-off-by Chunming Zhou <[email protected]>Cc Christian Konig <[email protected]>Cc Dave Airlie <[email protected]>Cc Daniel Rakos <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_syncobj.c | 383 +++++++++++++++++++++++++++++++++++++++--- include/drm/drm_syncobj.h | 28 +++ include/uapi/drm/drm.h | 1 + 3 files changed, 389 insertions(+), 23 deletions(-)drivers/gpu/drm/drm_syncobj.c +360
-23@@ -56,6 +56,44 @@#include "drm_internal.h" #include <drm/drm_syncobj.h> +struct drm_syncobj_stub_fence { +struct dma_fence base; +spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) +{ +return "syncobjstub" ; +} + +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) +{ +return !dma_fence_is_signaled (fence); +} + +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, + .release =NULL , +}; + +struct drm_syncobj_wait_pt { +struct drm_syncobj_stub_fence base; +u64 value; +struct rb_node node; +}; +struct drm_syncobj_signal_pt { +struct drm_syncobj_stub_fence base; +struct dma_fence *signal_fence; +struct dma_fence *pre_pt_base; +struct dma_fence_cb signal_cb; +struct dma_fence_cb pre_pt_cb; +struct drm_syncobj *syncobj; +u64 value; +struct list_head list; +}; +/** * drm_syncobj_find - lookup and reference a sync object. * @file_private: drm file private pointer @@ -137,6 +175,150 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj,spin_unlock (&syncobj->lock); } +static void drm_syncobj_timeline_signal_wait_pts (struct drm_syncobj *syncobj) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj->syncobj_timeline.wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +if (wait_pt->value <= syncobj->syncobj_timeline.timeline) { +dma_fence_signal (&wait_pt->base.base); +rb_erase (&wait_pt->node, + &syncobj->syncobj_timeline.wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + }else { +/* the loop is from left to right, the later entry value is +* bigger, so don't need to check any more */ +break ; + } + } +spin_unlock (&syncobj->lock); +} + + +static void pt_fence_cb (struct drm_syncobj_signal_pt *signal_pt) +{ +struct dma_fence *fence =NULL ; +struct drm_syncobj *syncobj; + + fence = signal_pt->signal_fence; + signal_pt->signal_fence =NULL ; +dma_fence_put (fence); + fence = signal_pt->pre_pt_base; + signal_pt->pre_pt_base =NULL ; +dma_fence_put (fence); + + syncobj = signal_pt->syncobj; +spin_lock (&syncobj->lock); +list_del (&signal_pt->list); + syncobj->syncobj_timeline.timeline = signal_pt->value; +spin_unlock (&syncobj->lock); +/* kfree(signal_pt) will be executed by below fence put */ +dma_fence_put (&signal_pt->base.base); +drm_syncobj_timeline_signal_wait_pts (syncobj); +} +static void pt_signal_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, signal_cb); + +if (signal_pt->pre_pt_base && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} +static void pt_pre_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, pre_pt_cb); + +if (signal_pt->signal_fence && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} + +static int drm_syncobj_timeline_replace_fence (struct drm_syncobj *syncobj, +struct dma_fence *fence, +u64 point) +{ +struct drm_syncobj_signal_pt *signal_pt = +kzalloc (sizeof (struct drm_syncobj_signal_pt ),GFP_KERNEL ); +struct drm_syncobj_signal_pt *tail_pt; +struct dma_fence *tail_pt_fence =NULL ; +int ret =0 ; + +if (!signal_pt) +return -ENOMEM ; +if (syncobj->syncobj_timeline.signal_point >= point) { +DRM_WARN ("A later signal is ready!" ); + goto out; + } +if (fence) +dma_fence_get (fence); +spin_lock (&syncobj->lock); +spin_lock_init (&signal_pt->base.lock); +dma_fence_init (&signal_pt->base.base, + &drm_syncobj_stub_fence_ops, + &signal_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + signal_pt->signal_fence = +rcu_dereference_protected (fence, +lockdep_is_held (&fence->lock)); +if (!list_empty (&syncobj->syncobj_timeline.signal_pt_list)) { + tail_pt =list_last_entry (&syncobj->syncobj_timeline.signal_pt_list, + struct drm_syncobj_signal_pt, list); + tail_pt_fence = &tail_pt->base.base; +if (dma_fence_is_signaled (tail_pt_fence)) + tail_pt_fence =NULL ; + } +if (tail_pt_fence) + signal_pt->pre_pt_base = +dma_fence_get (rcu_dereference_protected (tail_pt_fence, +lockdep_is_held (&tail_pt_fence->lock))); + + signal_pt->value = point; + syncobj->syncobj_timeline.signal_point = point; + signal_pt->syncobj = syncobj; +INIT_LIST_HEAD (&signal_pt->list); +list_add_tail (&signal_pt->list, &syncobj->syncobj_timeline.signal_pt_list); +spin_unlock (&syncobj->lock); +wake_up_all (&syncobj->syncobj_timeline.wq); +/** +* Every pt is depending on signal fence and previous pt fence, add +* callbacks to them +*/ +if (!dma_fence_is_signaled (signal_pt->signal_fence)) +dma_fence_add_callback (signal_pt->signal_fence, + &signal_pt->signal_cb, + pt_signal_fence_func); +else +pt_signal_fence_func (signal_pt->signal_fence, + &signal_pt->signal_cb); +if (signal_pt->pre_pt_base && !dma_fence_is_signaled (signal_pt->pre_pt_base)) +dma_fence_add_callback (signal_pt->pre_pt_base, + &signal_pt->pre_pt_cb, + pt_pre_fence_func); +else +pt_pre_fence_func (signal_pt->pre_pt_base, &signal_pt->pre_pt_cb); + + +return 0 ; +out: +kfree (signal_pt); +return ret; +} +/** * drm_syncobj_replace_fence - replace fence in a sync object. * @syncobj: Sync object to replace fence in @@ -152,6 +334,11 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,struct dma_fence *old_fence;struct drm_syncobj_cb *cur, *tmp; +if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { +drm_syncobj_timeline_replace_fence (syncobj, fence, + point); +return ; + }if (fence)dma_fence_get (fence);@@ -174,28 +361,6 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, }EXPORT_SYMBOL (drm_syncobj_replace_fence); -struct drm_syncobj_stub_fence { -struct dma_fence base; -spinlock_t lock; -}; - -static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) -{ -return "syncobjstub" ; -} - -static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) -{ -return !dma_fence_is_signaled (fence); -} - -static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { - .get_driver_name = drm_syncobj_stub_fence_get_name, - .get_timeline_name = drm_syncobj_stub_fence_get_name, - .enable_signaling = drm_syncobj_stub_fence_enable_signaling, - .release =NULL , -}; -static int drm_syncobj_assign_null_handle (struct drm_syncobj *syncobj) {struct drm_syncobj_stub_fence *fence;@@ -215,6 +380,121 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)return 0 ; } +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_lookup_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct rb_node *node = syncobj->syncobj_timeline.wait_pt_tree.rb_node; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + + +spin_lock (&syncobj->lock); +while (node) { +int result = point - wait_pt->value; + + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); +if (result <0 ) + node = node->rb_left; +else if (result >0 ) + node = node->rb_right; +else +break ; + } +spin_unlock (&syncobj->lock); + +return wait_pt; +} + +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_create_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct drm_syncobj_wait_pt *wait_pt; +struct rb_node **new = &(syncobj->syncobj_timeline.wait_pt_tree.rb_node), *parent =NULL ; + + wait_pt =kzalloc (sizeof (*wait_pt),GFP_KERNEL ); +if (!wait_pt) +return NULL ; +spin_lock_init (&wait_pt->base.lock); +dma_fence_init (&wait_pt->base.base, + &drm_syncobj_stub_fence_ops, + &wait_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + wait_pt->value = point; + +/* wait pt must be in an order, so that we can easily lookup and signal +* it */ +spin_lock (&syncobj->lock); +if (point <= syncobj->syncobj_timeline.timeline) +dma_fence_signal (&wait_pt->base.base); +while (*new) { +struct drm_syncobj_wait_pt *this = + rb_entry(*new, struct drm_syncobj_wait_pt, node); +int result = wait_pt->value - this->value; + + parent = *new; +if (result <0 ) + new = &((*new)->rb_left); +else if (result >0 ) + new = &((*new)->rb_right); +else + goto exist; + } + +rb_link_node (&wait_pt->node, parent, new); +rb_insert_color (&wait_pt->node, &syncobj->syncobj_timeline.wait_pt_tree); +spin_unlock (&syncobj->lock); +return wait_pt; +exist: +spin_unlock (&syncobj->lock); +dma_fence_put (&wait_pt->base.base); + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +return wait_pt; +} + +static struct dma_fence * +drm_syncobj_timeline_point_get (struct drm_syncobj *syncobj,u64 point,u64 flag) +{ +struct drm_syncobj_wait_pt *wait_pt; + +/* already signaled, simply return a signaled stub fence */ +if (point <= syncobj->syncobj_timeline.timeline) { +struct drm_syncobj_stub_fence *fence; + + fence =kzalloc (sizeof (*fence),GFP_KERNEL ); +if (fence ==NULL ) +return NULL ; + +spin_lock_init (&fence->lock); +dma_fence_init (&fence->base, &drm_syncobj_stub_fence_ops, + &fence->lock,0 ,0 ); +dma_fence_signal (&fence->base); +return &fence->base; + } + +/* check if the wait pt exists */ + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +if (!wait_pt) { +/* This is a new wait pt, so create it */ + wait_pt =drm_syncobj_timeline_create_wait_pt (syncobj, point); +if (!wait_pt) +return NULL ; + } +if (wait_pt) { +struct dma_fence *fence; +int ret = +wait_event_interruptible_timeout (syncobj->syncobj_timeline.wq, + wait_pt->value <= syncobj->syncobj_timeline.signal_point, +msecs_to_jiffies (10000 ));/* wait 10s */ + +if (ret <=0 ) +return NULL ; +rcu_read_lock (); + fence =dma_fence_get_rcu (&wait_pt->base.base); +rcu_read_unlock (); +return fence; + } +return NULL ; +} +/** * drm_syncobj_find_fence - lookup and reference the fence in a sync object * @file_private: drm file private pointer @@ -240,7 +520,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private,if (!syncobj)return -ENOENT ; - *fence =drm_syncobj_fence_get (syncobj); +if (syncobj->type ==DRM_SYNCOBJ_TYPE_NORMAL ) { +/* NORMAL syncobj doesn't care point value */ +WARN_ON (point !=0 ); + *fence =drm_syncobj_fence_get (syncobj); + }else if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { + *fence =drm_syncobj_timeline_point_get (syncobj, point, +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ); + }else { +DRM_ERROR ("Don't support this type syncobj\n" ); + *fence =NULL ; + }if (!*fence) { ret = -EINVAL ; }@@ -249,6 +539,34 @@ int drm_syncobj_find_fence(struct drm_file *file_private, }EXPORT_SYMBOL (drm_syncobj_find_fence); +static void drm_syncobj_timeline_fini (struct drm_syncobj *syncobj, +struct drm_syncobj_timeline *syncobj_timeline) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; +struct drm_syncobj_signal_pt *signal_pt =NULL , *tmp; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj_timeline->wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +rb_erase (&wait_pt->node, + &syncobj_timeline->wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + } +list_for_each_entry_safe (signal_pt, tmp, + &syncobj_timeline->signal_pt_list, list) { +list_del (&signal_pt->list); +dma_fence_put (signal_pt->signal_fence); +dma_fence_put (signal_pt->pre_pt_base); +dma_fence_put (&signal_pt->base.base); + } +spin_unlock (&syncobj->lock); +} +/** * drm_syncobj_free - free a sync object. * @kref: kref to free. @@ -261,10 +579,23 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj, refcount);drm_syncobj_replace_fence (syncobj,NULL ,0 ); +drm_syncobj_timeline_fini (syncobj, &syncobj->syncobj_timeline);kfree (syncobj); }EXPORT_SYMBOL (drm_syncobj_free); +static void drm_syncobj_timeline_init (struct drm_syncobj_timeline + *syncobj_timeline) +{ + syncobj_timeline->timeline_context =dma_fence_context_alloc (1 ); + syncobj_timeline->timeline =0 ; + syncobj_timeline->signal_point =0 ; +init_waitqueue_head (&syncobj_timeline->wq); + + syncobj_timeline->wait_pt_tree =RB_ROOT ; +INIT_LIST_HEAD (&syncobj_timeline->signal_pt_list); +} +/** * drm_syncobj_create - create a new syncobj * @out_syncobj: returned syncobj @@ -290,6 +621,12 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,kref_init (&syncobj->refcount);INIT_LIST_HEAD (&syncobj->cb_list);spin_lock_init (&syncobj->lock); +if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE ) { + syncobj->type =DRM_SYNCOBJ_TYPE_TIMELINE ; +drm_syncobj_timeline_init (&syncobj->syncobj_timeline); + }else { + syncobj->type =DRM_SYNCOBJ_TYPE_NORMAL ; + }if (flags &DRM_SYNCOBJ_CREATE_SIGNALED ) { ret =drm_syncobj_assign_null_handle (syncobj);include/drm/drm_syncobj.h +28
-0@@ -30,6 +30,25 @@struct drm_syncobj_cb ; +enum drm_syncobj_type { +DRM_SYNCOBJ_TYPE_NORMAL , +DRM_SYNCOBJ_TYPE_TIMELINE +}; + +struct drm_syncobj_timeline { +wait_queue_head_t wq; +u64 timeline_context; +/** +* @timeline: syncobj timeline +*/ +u64 timeline; +u64 signal_point; + + +struct rb_root wait_pt_tree; +struct list_head signal_pt_list; +}; +/** * struct drm_syncobj - sync object. * @@ -40,6 +59,15 @@ struct drm_syncobj {* @refcount: Reference count of this object. */ struct kref refcount; +/** +* @type: indicate syncobj type +*/ +enum drm_syncobj_type type; +/** +* @syncobj_timeline: timeline +*/ +struct drm_syncobj_timeline syncobj_timeline; +/** * @fence: * NULL or a pointer to the fence bound to this object. include/uapi/drm/drm.h +1
-0@@ -717,6 +717,7 @@ struct drm_prime_handle {struct drm_syncobj_create {__u32 handle;#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)__u32 flags; };
Quoted 3 lines
Quoted 3 lines
Signature · 1 line
2.14.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 5/5] drm: add syncobj timeline support v2
In reply to a message not in the archiveAm 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 8 lines
VK_KHR_timeline_semaphore:
This extension introduces a new type of semaphore that has an integer payload identifying a point in a timeline. Such timeline semaphores support the following operations:
* Host query - A host operation that allows querying the payload of the timeline semaphore.
* Host wait - A host operation that allows a blocking wait for a timeline semaphore to reach a specified value.
I think I have a idea what "Host" means in this context, but it would probably be better to describe it.
Quoted 16 lines
* Device wait - A device operation that allows waiting for a timeline semaphore to reach a specified value.
* Device signal - A device operation that allows advancing the timeline semaphore to a specified value.Since it's a timeline, that means the front time point(PT) always is signaled before the late PT. a. signal PT design:
Signal PT fence N depends on PT[N-1] fence and signal opertion fence, when PT[N] fence is signaled, the timeline will increase to value of PT[N].
b. wait PT design:
Wait PT fence is signaled by reaching timeline point value, when timeline is increasing, will compare wait PTs value with new timeline value, if PT value is lower than timeline value, then wait PT will be signaled, otherwise keep in list. semaphore wait operation can wait on any point of timeline, so need a RB tree to order them. And wait PT could ahead of signal PT, we need a sumission fence to perform that.
Quoted 7 lines
v2:
1. remove unusedDRM_SYNCOBJ_CREATE_TYPE_NORMAL. (Christian)
2. move unexposed denitions to .c file. (Daniel Vetter)
3. split up the change todrm_syncobj_find_fence()in a separate patch. (Christian)
4. split up the change todrm_syncobj_replace_fence()in a separate patch.
5. drop thesubmission_fenceimplementation and instead usewait_event()for that. (Christian)
6.WARN_ON(point != 0)for NORMAL type syncobj case. (Daniel Vetter)
I really liked Daniels idea to handle the classic syncobj like a timeline synobj with just 1 entry. That can probably simplify the implementation quite a bit.
Additional to that an amdgpu patch which shows how the interface is to be used is probably something Daniel will want to see as well.
Christian.
Quoted 521 lines
TODO:
1. CPU query and wait on timeline semaphore.
2. test application (Daniel Vetter)Signed-off-by Chunming Zhou <[email protected]>Cc Christian Konig <[email protected]>Cc Dave Airlie <[email protected]>Cc Daniel Rakos <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_syncobj.c | 383 +++++++++++++++++++++++++++++++++++++++--- include/drm/drm_syncobj.h | 28 +++ include/uapi/drm/drm.h | 1 + 3 files changed, 389 insertions(+), 23 deletions(-)drivers/gpu/drm/drm_syncobj.c +360
-23@@ -56,6 +56,44 @@#include "drm_internal.h" #include <drm/drm_syncobj.h> +struct drm_syncobj_stub_fence { +struct dma_fence base; +spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) +{ +return "syncobjstub" ; +} + +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) +{ +return !dma_fence_is_signaled (fence); +} + +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, + .release =NULL , +}; + +struct drm_syncobj_wait_pt { +struct drm_syncobj_stub_fence base; +u64 value; +struct rb_node node; +}; +struct drm_syncobj_signal_pt { +struct drm_syncobj_stub_fence base; +struct dma_fence *signal_fence; +struct dma_fence *pre_pt_base; +struct dma_fence_cb signal_cb; +struct dma_fence_cb pre_pt_cb; +struct drm_syncobj *syncobj; +u64 value; +struct list_head list; +}; +/** * drm_syncobj_find - lookup and reference a sync object. * @file_private: drm file private pointer @@ -137,6 +175,150 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj,spin_unlock (&syncobj->lock); } +static void drm_syncobj_timeline_signal_wait_pts (struct drm_syncobj *syncobj) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj->syncobj_timeline.wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +if (wait_pt->value <= syncobj->syncobj_timeline.timeline) { +dma_fence_signal (&wait_pt->base.base); +rb_erase (&wait_pt->node, + &syncobj->syncobj_timeline.wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + }else { +/* the loop is from left to right, the later entry value is +* bigger, so don't need to check any more */ +break ; + } + } +spin_unlock (&syncobj->lock); +} + + +static void pt_fence_cb (struct drm_syncobj_signal_pt *signal_pt) +{ +struct dma_fence *fence =NULL ; +struct drm_syncobj *syncobj; + + fence = signal_pt->signal_fence; + signal_pt->signal_fence =NULL ; +dma_fence_put (fence); + fence = signal_pt->pre_pt_base; + signal_pt->pre_pt_base =NULL ; +dma_fence_put (fence); + + syncobj = signal_pt->syncobj; +spin_lock (&syncobj->lock); +list_del (&signal_pt->list); + syncobj->syncobj_timeline.timeline = signal_pt->value; +spin_unlock (&syncobj->lock); +/* kfree(signal_pt) will be executed by below fence put */ +dma_fence_put (&signal_pt->base.base); +drm_syncobj_timeline_signal_wait_pts (syncobj); +} +static void pt_signal_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, signal_cb); + +if (signal_pt->pre_pt_base && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} +static void pt_pre_fence_func (struct dma_fence *fence, +struct dma_fence_cb *cb) +{ +struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, pre_pt_cb); + +if (signal_pt->signal_fence && + !dma_fence_is_signaled (signal_pt->pre_pt_base)) +return ; + +pt_fence_cb (signal_pt); +} + +static int drm_syncobj_timeline_replace_fence (struct drm_syncobj *syncobj, +struct dma_fence *fence, +u64 point) +{ +struct drm_syncobj_signal_pt *signal_pt = +kzalloc (sizeof (struct drm_syncobj_signal_pt ),GFP_KERNEL ); +struct drm_syncobj_signal_pt *tail_pt; +struct dma_fence *tail_pt_fence =NULL ; +int ret =0 ; + +if (!signal_pt) +return -ENOMEM ; +if (syncobj->syncobj_timeline.signal_point >= point) { +DRM_WARN ("A later signal is ready!" ); + goto out; + } +if (fence) +dma_fence_get (fence); +spin_lock (&syncobj->lock); +spin_lock_init (&signal_pt->base.lock); +dma_fence_init (&signal_pt->base.base, + &drm_syncobj_stub_fence_ops, + &signal_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + signal_pt->signal_fence = +rcu_dereference_protected (fence, +lockdep_is_held (&fence->lock)); +if (!list_empty (&syncobj->syncobj_timeline.signal_pt_list)) { + tail_pt =list_last_entry (&syncobj->syncobj_timeline.signal_pt_list, + struct drm_syncobj_signal_pt, list); + tail_pt_fence = &tail_pt->base.base; +if (dma_fence_is_signaled (tail_pt_fence)) + tail_pt_fence =NULL ; + } +if (tail_pt_fence) + signal_pt->pre_pt_base = +dma_fence_get (rcu_dereference_protected (tail_pt_fence, +lockdep_is_held (&tail_pt_fence->lock))); + + signal_pt->value = point; + syncobj->syncobj_timeline.signal_point = point; + signal_pt->syncobj = syncobj; +INIT_LIST_HEAD (&signal_pt->list); +list_add_tail (&signal_pt->list, &syncobj->syncobj_timeline.signal_pt_list); +spin_unlock (&syncobj->lock); +wake_up_all (&syncobj->syncobj_timeline.wq); +/** +* Every pt is depending on signal fence and previous pt fence, add +* callbacks to them +*/ +if (!dma_fence_is_signaled (signal_pt->signal_fence)) +dma_fence_add_callback (signal_pt->signal_fence, + &signal_pt->signal_cb, + pt_signal_fence_func); +else +pt_signal_fence_func (signal_pt->signal_fence, + &signal_pt->signal_cb); +if (signal_pt->pre_pt_base && !dma_fence_is_signaled (signal_pt->pre_pt_base)) +dma_fence_add_callback (signal_pt->pre_pt_base, + &signal_pt->pre_pt_cb, + pt_pre_fence_func); +else +pt_pre_fence_func (signal_pt->pre_pt_base, &signal_pt->pre_pt_cb); + + +return 0 ; +out: +kfree (signal_pt); +return ret; +} +/** * drm_syncobj_replace_fence - replace fence in a sync object. * @syncobj: Sync object to replace fence in @@ -152,6 +334,11 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,struct dma_fence *old_fence;struct drm_syncobj_cb *cur, *tmp; +if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { +drm_syncobj_timeline_replace_fence (syncobj, fence, + point); +return ; + }if (fence)dma_fence_get (fence);@@ -174,28 +361,6 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, }EXPORT_SYMBOL (drm_syncobj_replace_fence); -struct drm_syncobj_stub_fence { -struct dma_fence base; -spinlock_t lock; -}; - -static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) -{ -return "syncobjstub" ; -} - -static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) -{ -return !dma_fence_is_signaled (fence); -} - -static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { - .get_driver_name = drm_syncobj_stub_fence_get_name, - .get_timeline_name = drm_syncobj_stub_fence_get_name, - .enable_signaling = drm_syncobj_stub_fence_enable_signaling, - .release =NULL , -}; -static int drm_syncobj_assign_null_handle (struct drm_syncobj *syncobj) {struct drm_syncobj_stub_fence *fence;@@ -215,6 +380,121 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)return 0 ; } +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_lookup_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct rb_node *node = syncobj->syncobj_timeline.wait_pt_tree.rb_node; +struct drm_syncobj_wait_pt *wait_pt =NULL ; + + +spin_lock (&syncobj->lock); +while (node) { +int result = point - wait_pt->value; + + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); +if (result <0 ) + node = node->rb_left; +else if (result >0 ) + node = node->rb_right; +else +break ; + } +spin_unlock (&syncobj->lock); + +return wait_pt; +} + +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_create_wait_pt (struct drm_syncobj *syncobj,u64 point) +{ +struct drm_syncobj_wait_pt *wait_pt; +struct rb_node **new = &(syncobj->syncobj_timeline.wait_pt_tree.rb_node), *parent =NULL ; + + wait_pt =kzalloc (sizeof (*wait_pt),GFP_KERNEL ); +if (!wait_pt) +return NULL ; +spin_lock_init (&wait_pt->base.lock); +dma_fence_init (&wait_pt->base.base, + &drm_syncobj_stub_fence_ops, + &wait_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + wait_pt->value = point; + +/* wait pt must be in an order, so that we can easily lookup and signal +* it */ +spin_lock (&syncobj->lock); +if (point <= syncobj->syncobj_timeline.timeline) +dma_fence_signal (&wait_pt->base.base); +while (*new) { +struct drm_syncobj_wait_pt *this = + rb_entry(*new, struct drm_syncobj_wait_pt, node); +int result = wait_pt->value - this->value; + + parent = *new; +if (result <0 ) + new = &((*new)->rb_left); +else if (result >0 ) + new = &((*new)->rb_right); +else + goto exist; + } + +rb_link_node (&wait_pt->node, parent, new); +rb_insert_color (&wait_pt->node, &syncobj->syncobj_timeline.wait_pt_tree); +spin_unlock (&syncobj->lock); +return wait_pt; +exist: +spin_unlock (&syncobj->lock); +dma_fence_put (&wait_pt->base.base); + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +return wait_pt; +} + +static struct dma_fence * +drm_syncobj_timeline_point_get (struct drm_syncobj *syncobj,u64 point,u64 flag) +{ +struct drm_syncobj_wait_pt *wait_pt; + +/* already signaled, simply return a signaled stub fence */ +if (point <= syncobj->syncobj_timeline.timeline) { +struct drm_syncobj_stub_fence *fence; + + fence =kzalloc (sizeof (*fence),GFP_KERNEL ); +if (fence ==NULL ) +return NULL ; + +spin_lock_init (&fence->lock); +dma_fence_init (&fence->base, &drm_syncobj_stub_fence_ops, + &fence->lock,0 ,0 ); +dma_fence_signal (&fence->base); +return &fence->base; + } + +/* check if the wait pt exists */ + wait_pt =drm_syncobj_timeline_lookup_wait_pt (syncobj, point); +if (!wait_pt) { +/* This is a new wait pt, so create it */ + wait_pt =drm_syncobj_timeline_create_wait_pt (syncobj, point); +if (!wait_pt) +return NULL ; + } +if (wait_pt) { +struct dma_fence *fence; +int ret = +wait_event_interruptible_timeout (syncobj->syncobj_timeline.wq, + wait_pt->value <= syncobj->syncobj_timeline.signal_point, +msecs_to_jiffies (10000 ));/* wait 10s */ + +if (ret <=0 ) +return NULL ; +rcu_read_lock (); + fence =dma_fence_get_rcu (&wait_pt->base.base); +rcu_read_unlock (); +return fence; + } +return NULL ; +} +/** * drm_syncobj_find_fence - lookup and reference the fence in a sync object * @file_private: drm file private pointer @@ -240,7 +520,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private,if (!syncobj)return -ENOENT ; - *fence =drm_syncobj_fence_get (syncobj); +if (syncobj->type ==DRM_SYNCOBJ_TYPE_NORMAL ) { +/* NORMAL syncobj doesn't care point value */ +WARN_ON (point !=0 ); + *fence =drm_syncobj_fence_get (syncobj); + }else if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { + *fence =drm_syncobj_timeline_point_get (syncobj, point, +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ); + }else { +DRM_ERROR ("Don't support this type syncobj\n" ); + *fence =NULL ; + }if (!*fence) { ret = -EINVAL ; }@@ -249,6 +539,34 @@ int drm_syncobj_find_fence(struct drm_file *file_private, }EXPORT_SYMBOL (drm_syncobj_find_fence); +static void drm_syncobj_timeline_fini (struct drm_syncobj *syncobj, +struct drm_syncobj_timeline *syncobj_timeline) +{ +struct rb_node *node =NULL ; +struct drm_syncobj_wait_pt *wait_pt =NULL ; +struct drm_syncobj_signal_pt *signal_pt =NULL , *tmp; + +spin_lock (&syncobj->lock); +for (node =rb_first (&syncobj_timeline->wait_pt_tree); + node !=NULL ; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node =rb_next (node); +rb_erase (&wait_pt->node, + &syncobj_timeline->wait_pt_tree); +RB_CLEAR_NODE (&wait_pt->node); +/* kfree(wait_pt) is excuted by fence put */ +dma_fence_put (&wait_pt->base.base); + } +list_for_each_entry_safe (signal_pt, tmp, + &syncobj_timeline->signal_pt_list, list) { +list_del (&signal_pt->list); +dma_fence_put (signal_pt->signal_fence); +dma_fence_put (signal_pt->pre_pt_base); +dma_fence_put (&signal_pt->base.base); + } +spin_unlock (&syncobj->lock); +} +/** * drm_syncobj_free - free a sync object. * @kref: kref to free. @@ -261,10 +579,23 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj, refcount);drm_syncobj_replace_fence (syncobj,NULL ,0 ); +drm_syncobj_timeline_fini (syncobj, &syncobj->syncobj_timeline);kfree (syncobj); }EXPORT_SYMBOL (drm_syncobj_free); +static void drm_syncobj_timeline_init (struct drm_syncobj_timeline + *syncobj_timeline) +{ + syncobj_timeline->timeline_context =dma_fence_context_alloc (1 ); + syncobj_timeline->timeline =0 ; + syncobj_timeline->signal_point =0 ; +init_waitqueue_head (&syncobj_timeline->wq); + + syncobj_timeline->wait_pt_tree =RB_ROOT ; +INIT_LIST_HEAD (&syncobj_timeline->signal_pt_list); +} +/** * drm_syncobj_create - create a new syncobj * @out_syncobj: returned syncobj @@ -290,6 +621,12 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,kref_init (&syncobj->refcount);INIT_LIST_HEAD (&syncobj->cb_list);spin_lock_init (&syncobj->lock); +if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE ) { + syncobj->type =DRM_SYNCOBJ_TYPE_TIMELINE ; +drm_syncobj_timeline_init (&syncobj->syncobj_timeline); + }else { + syncobj->type =DRM_SYNCOBJ_TYPE_NORMAL ; + }if (flags &DRM_SYNCOBJ_CREATE_SIGNALED ) { ret =drm_syncobj_assign_null_handle (syncobj);include/drm/drm_syncobj.h +28
-0@@ -30,6 +30,25 @@struct drm_syncobj_cb ; +enum drm_syncobj_type { +DRM_SYNCOBJ_TYPE_NORMAL , +DRM_SYNCOBJ_TYPE_TIMELINE +}; + +struct drm_syncobj_timeline { +wait_queue_head_t wq; +u64 timeline_context; +/** +* @timeline: syncobj timeline +*/ +u64 timeline; +u64 signal_point; + + +struct rb_root wait_pt_tree; +struct list_head signal_pt_list; +}; +/** * struct drm_syncobj - sync object. * @@ -40,6 +59,15 @@ struct drm_syncobj {* @refcount: Reference count of this object. */ struct kref refcount; +/** +* @type: indicate syncobj type +*/ +enum drm_syncobj_type type; +/** +* @syncobj_timeline: timeline +*/ +struct drm_syncobj_timeline syncobj_timeline; +/** * @fence: * NULL or a pointer to the fence bound to this object. include/uapi/drm/drm.h +0
-0
include/uapi/drm/drm.h struct drm_prime_handle { · line 723
Quoted 7 lines
include/uapi/drm/drm.h +1
-0@@ -717,6 +717,7 @@ struct drm_prime_handle {struct drm_syncobj_create {__u32 handle;#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)__u32 flags; };
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 5/5] drm: add syncobj timeline support v2
Quoted 11 lines · Christian König
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 8 lines
VK_KHR_timeline_semaphore:
This extension introduces a new type of semaphore that has an integer payload identifying a point in a timeline. Such timeline semaphores support the following operations:
* Host query - A host operation that allows querying the payload of the timeline semaphore.
* Host wait - A host operation that allows a blocking wait for a timeline semaphore to reach a specified value.I think I have a idea what "Host" means in this context, but it would probably be better to describe it.
How about "CPU"?
Quoted 24 lines
Quoted 16 lines
* Device wait - A device operation that allows waiting for a timeline semaphore to reach a specified value.
* Device signal - A device operation that allows advancing the timeline semaphore to a specified value.Since it's a timeline, that means the front time point(PT) always is signaled before the late PT. a. signal PT design:
Signal PT fence N depends on PT[N-1] fence and signal opertion fence, when PT[N] fence is signaled, the timeline will increase to value of PT[N].
b. wait PT design:
Wait PT fence is signaled by reaching timeline point value, when timeline is increasing, will compare wait PTs value with new timeline value, if PT value is lower than timeline value, then wait PT will be signaled, otherwise keep in list. semaphore wait operation can wait on any point of timeline, so need a RB tree to order them. And wait PT could ahead of signal PT, we need a sumission fence to perform that.Quoted 7 lines
v2:
1. remove unusedDRM_SYNCOBJ_CREATE_TYPE_NORMAL. (Christian)
2. move unexposed denitions to .c file. (Daniel Vetter)
3. split up the change todrm_syncobj_find_fence()in a separate patch. (Christian)
4. split up the change todrm_syncobj_replace_fence()in a separate patch.
5. drop thesubmission_fenceimplementation and instead usewait_event()for that. (Christian)
6.WARN_ON(point != 0)for NORMAL type syncobj case. (Daniel Vetter)
Quoted 1 line
I really liked Daniels idea to handle the classic syncobj like a timeline synobj with just 1 entry. That can probably simplify the implementation quite a bit.
Yeah, after timeline, seems we can remove old syncobj->fence, right? will try to unify them in additional patch.
Thanks,
David Zhou
Quoted 536 lines
Additional to that an amdgpu patch which shows how the interface is to be used is probably something Daniel will want to see as well.
Christian.
Quoted 531 lines
TODO:
1. CPU query and wait on timeline semaphore.
2. test application (Daniel Vetter)Signed-off-by Chunming Zhou <[email protected]>Cc Christian Konig <[email protected]>Cc Dave Airlie <[email protected]>Cc Daniel Rakos <[email protected]>Cc Daniel Vetter <[email protected]>---
drivers/gpu/drm/drm_syncobj.c| 383
+++++++++++++++++++++++++++++++++++++++---
include/drm/drm_syncobj.h | 28 +++
include/uapi/drm/drm.h | 1 +3 files changed, 389 insertions(+), 23 deletions(-)drivers/gpu/drm/drm_syncobj.c +37
-0@@ -56,6 +56,44 @@ #include "drm_internal.h" #include <drm/drm_syncobj.h> +struct drm_syncobj_stub_fence { + struct dma_fence base; + spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) +{ + return "syncobjstub"; +} + +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) +{ + return !dma_fence_is_signaled(fence); +} + +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, + .release = NULL, +}; + +struct drm_syncobj_wait_pt { + struct drm_syncobj_stub_fence base; + u64 value; + struct rb_node node; +}; +struct drm_syncobj_signal_pt { + struct drm_syncobj_stub_fence base; + struct dma_fence *signal_fence; + struct dma_fence *pre_pt_base; + struct dma_fence_cb signal_cb; + struct dma_fence_cb pre_pt_cb; + struct drm_syncobj *syncobj; + u64 value; + struct list_head list; +}; + /***
drm_syncobj_find- lookup and reference a sync object.
* @file_private: drm file private pointerdrivers/gpu/drm/drm_syncobj.c +116
-0@@ -137,6 +175,150 @@ void drm_syncobj_remove_callback(structdrm_syncobj *syncobj, spin_unlock(&syncobj->lock); } +static void drm_syncobj_timeline_signal_wait_pts(struct drm_syncobj *syncobj) +{ + struct rb_node *node = NULL; + struct drm_syncobj_wait_pt *wait_pt = NULL; + + spin_lock(&syncobj->lock); + for(node = rb_first(&syncobj->syncobj_timeline.wait_pt_tree); + node != NULL; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node = rb_next(node); + if (wait_pt->value <= syncobj->syncobj_timeline.timeline) { + dma_fence_signal(&wait_pt->base.base); + rb_erase(&wait_pt->node, + &syncobj->syncobj_timeline.wait_pt_tree); + RB_CLEAR_NODE(&wait_pt->node); + /* kfree(wait_pt) is excuted by fence put */ + dma_fence_put(&wait_pt->base.base); + } else { + /* the loop is from left to right, the later entry value is + * bigger, so don't need to check any more */ + break; + } + } + spin_unlock(&syncobj->lock); +} + + +static void pt_fence_cb (struct drm_syncobj_signal_pt *signal_pt) +{ + struct dma_fence *fence = NULL; + struct drm_syncobj *syncobj; + + fence = signal_pt->signal_fence; + signal_pt->signal_fence = NULL; + dma_fence_put(fence); + fence = signal_pt->pre_pt_base; + signal_pt->pre_pt_base = NULL; + dma_fence_put(fence); + + syncobj = signal_pt->syncobj; + spin_lock(&syncobj->lock); + list_del(&signal_pt->list); + syncobj->syncobj_timeline.timeline = signal_pt->value; + spin_unlock(&syncobj->lock); + /* kfree(signal_pt) will be executed by below fence put */ + dma_fence_put(&signal_pt->base.base); + drm_syncobj_timeline_signal_wait_pts(syncobj); +} +static void pt_signal_fence_func (struct dma_fence *fence, + struct dma_fence_cb *cb) +{ + struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, signal_cb); + + if (signal_pt->pre_pt_base && + !dma_fence_is_signaled(signal_pt->pre_pt_base)) + return; + + pt_fence_cb(signal_pt); +} +static void pt_pre_fence_func (struct dma_fence *fence, + struct dma_fence_cb *cb) +{ + struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, pre_pt_cb); + + if (signal_pt->signal_fence && + !dma_fence_is_signaled(signal_pt->pre_pt_base)) + return; + + pt_fence_cb(signal_pt); +} + +static int drm_syncobj_timeline_replace_fence (struct drm_syncobj *syncobj, + struct dma_fence *fence, + u64 point) +{ + struct drm_syncobj_signal_pt *signal_pt = + kzalloc(sizeof(struct drm_syncobj_signal_pt), GFP_KERNEL); + struct drm_syncobj_signal_pt *tail_pt; + struct dma_fence *tail_pt_fence = NULL; + int ret = 0; + + if (!signal_pt) + return -ENOMEM; + if (syncobj->syncobj_timeline.signal_point >= point) { + DRM_WARN("A later signal is ready!"); + goto out; + } + if (fence) + dma_fence_get(fence); + spin_lock(&syncobj->lock); + spin_lock_init(&signal_pt->base.lock); + dma_fence_init(&signal_pt->base.base, + &drm_syncobj_stub_fence_ops, + &signal_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + signal_pt->signal_fence = + rcu_dereference_protected(fence, + lockdep_is_held(&fence->lock)); + if (!list_empty(&syncobj->syncobj_timeline.signal_pt_list)) { + tail_pt =list_last_entry (&syncobj->syncobj_timeline.signal_pt_list, + struct drm_syncobj_signal_pt, list); + tail_pt_fence = &tail_pt->base.base; + if (dma_fence_is_signaled(tail_pt_fence)) + tail_pt_fence = NULL; + } + if (tail_pt_fence) + signal_pt->pre_pt_base = +dma_fence_get (rcu_dereference_protected (tail_pt_fence, +lockdep_is_held (&tail_pt_fence->lock))); + + signal_pt->value = point; + syncobj->syncobj_timeline.signal_point = point; + signal_pt->syncobj = syncobj; + INIT_LIST_HEAD(&signal_pt->list); + list_add_tail(&signal_pt->list,
&syncobj->syncobj_timeline.signal_pt_list);
+spin_unlock(&syncobj->lock);
+wake_up_all(&syncobj->syncobj_timeline.wq);
+ /**
+ * Every pt is depending on signal fence and previous pt fence, add + * callbacks to them
+ */
+ if (!dma_fence_is_signaled(signal_pt->signal_fence))
+ dma_fence_add_callback(signal_pt->signal_fence,
+&signal_pt->signal_cb,
+pt_signal_fence_func);
+ else
+ pt_signal_fence_func(signal_pt->signal_fence,
+&signal_pt->signal_cb);
+ if (signal_pt->pre_pt_base&& !dma_fence_is_signaled(signal_pt->pre_pt_base))
+ dma_fence_add_callback(signal_pt->pre_pt_base,
+&signal_pt->pre_pt_cb,
+pt_pre_fence_func);
+ else
+pt_pre_fence_func(signal_pt->pre_pt_base, &signal_pt->pre_pt_cb);drivers/gpu/drm/drm_syncobj.c +8
-0+ + + return 0; +out: + kfree(signal_pt); + return ret; +} +/**
*drm_syncobj_replace_fence- replace fence in a sync object.
* @syncobj: Sync object to replace fence indrivers/gpu/drm/drm_syncobj.c +4
-0@@ -152,6 +334,11 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *old_fence; struct drm_syncobj_cb *cur, *tmp; + if (syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE) { + drm_syncobj_timeline_replace_fence(syncobj, fence, + point); + return; + } if (fence) dma_fence_get(fence);@@ -174,28 +361,6 @@ void drm_syncobj_replace_fence(struct
drm_syncobj*syncobj, }
EXPORT_SYMBOL(drm_syncobj_replace_fence);
-structdrm_syncobj_stub_fence{
- structdma_fencebase;
-spinlock_tlock;drivers/gpu/drm/drm_syncobj.c +0
-3-}; - -static const char *drm_syncobj_stub_fence_get_name(struct dma_fence*fence)
drivers/gpu/drm/drm_syncobj.c +0
-5-{ - return "syncobjstub"; -} - -static bool drm_syncobj_stub_fence_enable_signaling(struct dma_fence*fence)
drivers/gpu/drm/drm_syncobj.c +0
-11-{ - return !dma_fence_is_signaled(fence); -} - -static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { - .get_driver_name = drm_syncobj_stub_fence_get_name, - .get_timeline_name = drm_syncobj_stub_fence_get_name, - .enable_signaling = drm_syncobj_stub_fence_enable_signaling, - .release = NULL, -}; -static int
drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj){
structdrm_syncobj_stub_fence*fence;drivers/gpu/drm/drm_syncobj.c +0
-0@@ -215,6 +380,121 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) return 0; }+static struct
drm_syncobj_wait_pt* +drm_syncobj_timeline_lookup_wait_pt(structdrm_syncobj*syncobj, u64 point)
+{
+ structrb_node*node =syncobj->syncobj_timeline.wait_pt_tree.rb_node;
+ structdrm_syncobj_wait_pt*wait_pt= NULL;drivers/gpu/drm/drm_syncobj.c +21
-0+ + + spin_lock(&syncobj->lock); + while(node) { + int result = point - wait_pt->value; + + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + if (result < 0) + node = node->rb_left; + else if (result > 0) + node = node->rb_right; + else + break; + } + spin_unlock(&syncobj->lock); + + return wait_pt; +} + +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_create_wait_pt(struct drm_syncobj *syncobj, u64point)
+{
+ structdrm_syncobj_wait_pt*wait_pt;
+ structrb_node**new = &(syncobj->syncobj_timeline.wait_pt_tree.rb_node), *parent = NULL;drivers/gpu/drm/drm_syncobj.c +12
-0+ + wait_pt = kzalloc(sizeof(*wait_pt), GFP_KERNEL); + if (!wait_pt) + return NULL; + spin_lock_init(&wait_pt->base.lock); + dma_fence_init(&wait_pt->base.base, + &drm_syncobj_stub_fence_ops, + &wait_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + wait_pt->value = point; + + /* wait pt must be in an order, so that we can easily lookup andsignal
+ * it */
+spin_lock(&syncobj->lock);
+ if (point <=syncobj->syncobj_timeline.timeline) +dma_fence_signal(&wait_pt->base.base);
+while(*new){
+ structdrm_syncobj_wait_pt*this =
+rb_entry(*new, struct drm_syncobj_wait_pt, node); + int result =wait_pt->value-this->value;drivers/gpu/drm/drm_syncobj.c +12
-0+ + parent = *new; + if (result < 0) + new = &((*new)->rb_left); + else if (result > 0) + new = &((*new)->rb_right); + else + goto exist; + } + + rb_link_node(&wait_pt->node, parent, new); + rb_insert_color(&wait_pt->node,
&syncobj->syncobj_timeline.wait_pt_tree);
+spin_unlock(&syncobj->lock);
+ returnwait_pt;drivers/gpu/drm/drm_syncobj.c +9
-0+exist: + spin_unlock(&syncobj->lock); + dma_fence_put(&wait_pt->base.base); + wait_pt = drm_syncobj_timeline_lookup_wait_pt(syncobj, point); + return wait_pt; +} + +static struct dma_fence * +drm_syncobj_timeline_point_get(struct drm_syncobj *syncobj, u64point, u64 flag)
drivers/gpu/drm/drm_syncobj.c +31
-0+{ + struct drm_syncobj_wait_pt *wait_pt; + + /* already signaled, simply return a signaled stub fence */ + if (point <= syncobj->syncobj_timeline.timeline) { + struct drm_syncobj_stub_fence *fence; + + fence = kzalloc(sizeof(*fence), GFP_KERNEL); + if (fence == NULL) + return NULL; + + spin_lock_init(&fence->lock); + dma_fence_init(&fence->base, &drm_syncobj_stub_fence_ops, + &fence->lock, 0, 0); + dma_fence_signal(&fence->base); + return &fence->base; + } + + /* check if the wait pt exists */ + wait_pt = drm_syncobj_timeline_lookup_wait_pt(syncobj, point); + if (!wait_pt) { + /* This is a new wait pt, so create it */ + wait_pt = drm_syncobj_timeline_create_wait_pt(syncobj, point); + if (!wait_pt) + return NULL; + } + if (wait_pt) { + struct dma_fence *fence; + int ret = + wait_event_interruptible_timeout(syncobj->syncobj_timeline.wq, + wait_pt->value <=
syncobj->syncobj_timeline.signal_point,
+msecs_to_jiffies(10000)); /* wait 10s */drivers/gpu/drm/drm_syncobj.c +11
-0+ + if (ret <= 0) + return NULL; + rcu_read_lock(); + fence = dma_fence_get_rcu(&wait_pt->base.base); + rcu_read_unlock(); + return fence; + } + return NULL; +} +/**
*drm_syncobj_find_fence- lookup and reference the fence in a sync object
* @file_private: drm file private pointerdrivers/gpu/drm/drm_syncobj.c +11
-0@@ -240,7 +520,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private, if (!syncobj) return -ENOENT; - *fence = drm_syncobj_fence_get(syncobj); + if (syncobj->type == DRM_SYNCOBJ_TYPE_NORMAL) { + /* NORMAL syncobj doesn't care point value */ + WARN_ON(point != 0); + *fence = drm_syncobj_fence_get(syncobj); + } else if (syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE) { + *fence = drm_syncobj_timeline_point_get(syncobj, point, +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ); + } else { + DRM_ERROR("Don't support this type syncobj\n"); + *fence = NULL; + } if (!*fence) { ret = -EINVAL;}
drivers/gpu/drm/drm_syncobj.c +27
-0@@ -249,6 +539,34 @@ int drm_syncobj_find_fence(struct drm_file *file_private, } EXPORT_SYMBOL(drm_syncobj_find_fence); +static void drm_syncobj_timeline_fini(struct drm_syncobj *syncobj, + struct drm_syncobj_timeline *syncobj_timeline) +{ + struct rb_node *node = NULL; + struct drm_syncobj_wait_pt *wait_pt = NULL; + struct drm_syncobj_signal_pt *signal_pt = NULL, *tmp; + + spin_lock(&syncobj->lock); + for(node = rb_first(&syncobj_timeline->wait_pt_tree); + node != NULL; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node = rb_next(node); + rb_erase(&wait_pt->node, + &syncobj_timeline->wait_pt_tree); + RB_CLEAR_NODE(&wait_pt->node); + /* kfree(wait_pt) is excuted by fence put */ + dma_fence_put(&wait_pt->base.base); + } + list_for_each_entry_safe(signal_pt, tmp, + &syncobj_timeline->signal_pt_list, list) { + list_del(&signal_pt->list); + dma_fence_put(signal_pt->signal_fence); + dma_fence_put(signal_pt->pre_pt_base); + dma_fence_put(&signal_pt->base.base); + } + spin_unlock(&syncobj->lock); +} + /*** drm_syncobj_free - free a sync object. * @kref: kref to free.
drivers/gpu/drm/drm_syncobj.c +1
-0@@ -261,10 +579,23 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj, refcount); drm_syncobj_replace_fence(syncobj, NULL, 0); + drm_syncobj_timeline_fini(syncobj, &syncobj->syncobj_timeline); kfree(syncobj); } EXPORT_SYMBOL(drm_syncobj_free);+static void
drm_syncobj_timeline_init(struct drm_syncobj_timeline + *syncobj_timeline)drivers/gpu/drm/drm_syncobj.c +10
-0+{ + syncobj_timeline->timeline_context = dma_fence_context_alloc(1); + syncobj_timeline->timeline = 0; + syncobj_timeline->signal_point = 0; + init_waitqueue_head(&syncobj_timeline->wq); + + syncobj_timeline->wait_pt_tree = RB_ROOT; + INIT_LIST_HEAD(&syncobj_timeline->signal_pt_list); +} +/**
*drm_syncobj_create- create a new syncobj
* @out_syncobj: returned syncobjdrivers/gpu/drm/drm_syncobj.c +6
-0@@ -290,6 +621,12 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags, kref_init(&syncobj->refcount); INIT_LIST_HEAD(&syncobj->cb_list); spin_lock_init(&syncobj->lock); + if (flags & DRM_SYNCOBJ_CREATE_TYPE_TIMELINE) { + syncobj->type = DRM_SYNCOBJ_TYPE_TIMELINE; +drm_syncobj_timeline_init (&syncobj->syncobj_timeline); + } else { + syncobj->type = DRM_SYNCOBJ_TYPE_NORMAL; + } if (flags & DRM_SYNCOBJ_CREATE_SIGNALED) { ret = drm_syncobj_assign_null_handle(syncobj);include/drm/drm_syncobj.h +27
-0@@ -30,6 +30,25 @@ struct drm_syncobj_cb; +enum drm_syncobj_type { + DRM_SYNCOBJ_TYPE_NORMAL, + DRM_SYNCOBJ_TYPE_TIMELINE +}; + +struct drm_syncobj_timeline { + wait_queue_head_t wq; + u64 timeline_context; + /** + * @timeline: syncobj timeline + */ + u64 timeline; + u64 signal_point; + + + struct rb_root wait_pt_tree; + struct list_head signal_pt_list; +}; + /*** struct drm_syncobj - sync object. * @@ -40,6 +59,15 @@ struct drm_syncobj {* @refcount: Reference count of this object. */ struct kref refcount; + /** + * @type: indicate syncobj type + */ + enum drm_syncobj_type type; + /** + * @syncobj_timeline: timeline + */ + struct drm_syncobj_timeline syncobj_timeline; + /*** @fence: * NULL or a pointer to the fence bound to this object. include/uapi/drm/drm.h +0
-1--- a/include/uapi/drm/drm.h
Quoted 9 lines
include/uapi/drm/drm.h struct drm_prime_handle { · line 722
Quoted 8 lines
+++
b/include/uapi/drm/drm.hinclude/uapi/drm/drm.h +1
-0@@ -717,6 +717,7 @@ struct drm_prime_handle { struct drm_syncobj_create { __u32 handle; #define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1) __u32 flags; };
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 5/5] drm: add syncobj timeline support v2
Am 23.08.2018 um 11:58 schrieb zhoucm1:
Quoted 13 lines · Christian König
Quoted 10 lines
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 8 lines
VK_KHR_timeline_semaphore:
This extension introduces a new type of semaphore that has an integer payload identifying a point in a timeline. Such timeline semaphores support the following operations:
* Host query - A host operation that allows querying the payload of the timeline semaphore.
* Host wait - A host operation that allows a blocking wait for a timeline semaphore to reach a specified value.
Quoted 3 lines
Quoted 1 line
I think I have a idea what "Host" means in this context, but it would probably be better to describe it.
How about "CPU"?
Yeah, that's probably better.
Quoted 25 lines
Quoted 25 lines
Quoted 24 lines
* Device wait - A device operation that allows waiting for a timeline semaphore to reach a specified value.
* Device signal - A device operation that allows advancing the timeline semaphore to a specified value.Since it's a timeline, that means the front time point(PT) always is signaled before the late PT. a. signal PT design:
Signal PT fence N depends on PT[N-1] fence and signal opertion fence, when PT[N] fence is signaled, the timeline will increase to value of PT[N].
b. wait PT design:
Wait PT fence is signaled by reaching timeline point value, when timeline is increasing, will compare wait PTs value with new timeline value, if PT value is lower than timeline value, then wait PT will be signaled, otherwise keep in list. semaphore wait operation can wait on any point of timeline, so need a RB tree to order them. And wait PT could ahead of signal PT, we need a sumission fence to perform that.v2:
1. remove unusedDRM_SYNCOBJ_CREATE_TYPE_NORMAL. (Christian)
2. move unexposed denitions to .c file. (Daniel Vetter)
3. split up the change todrm_syncobj_find_fence()in a separate patch. (Christian)
4. split up the change todrm_syncobj_replace_fence()in a separate patch.
5. drop thesubmission_fenceimplementation and instead usewait_event()for that. (Christian)
6.WARN_ON(point != 0)for NORMAL type syncobj case. (Daniel Vetter)
Quoted 2 lines
Quoted 1 line
I really liked Daniels idea to handle the classic syncobj like a timeline synobj with just 1 entry. That can probably simplify the implementation quite a bit.
Yeah, after timeline, seems we can remove old
syncobj->fence, right? will try to unify them in additional patch.
I think we could do something like the following:
1. When drm_syncobj_find_fence is called with point zero then we return the last added one.
2. When drm_syncobj_find_fence is called with point zero we add the new fence as with N+1 to the list.
This way syncobj should keep it's functionality as is with the timeline support added on top.
Regards,
Christian.
Quoted 551 lines
Thanks,
David ZhouQuoted 538 lines
Additional to that an amdgpu patch which shows how the interface is to be used is probably something Daniel will want to see as well.
Christian.
Quoted 533 lines
TODO:
1. CPU query and wait on timeline semaphore.
2. test application (Daniel Vetter)Signed-off-by Chunming Zhou <[email protected]>Cc Christian Konig <[email protected]>Cc Dave Airlie <[email protected]>Cc Daniel Rakos <[email protected]>Cc Daniel Vetter <[email protected]>---
drivers/gpu/drm/drm_syncobj.c| 383
+++++++++++++++++++++++++++++++++++++++---
include/drm/drm_syncobj.h | 28 +++
include/uapi/drm/drm.h | 1 +3 files changed, 389 insertions(+), 23 deletions(-)drivers/gpu/drm/drm_syncobj.c +37
-0@@ -56,6 +56,44 @@ #include "drm_internal.h" #include <drm/drm_syncobj.h> +struct drm_syncobj_stub_fence { + struct dma_fence base; + spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name (struct dma_fence *fence) +{ + return "syncobjstub"; +} + +static bool drm_syncobj_stub_fence_enable_signaling (struct dma_fence *fence) +{ + return !dma_fence_is_signaled(fence); +} + +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, + .release = NULL, +}; + +struct drm_syncobj_wait_pt { + struct drm_syncobj_stub_fence base; + u64 value; + struct rb_node node; +}; +struct drm_syncobj_signal_pt { + struct drm_syncobj_stub_fence base; + struct dma_fence *signal_fence; + struct dma_fence *pre_pt_base; + struct dma_fence_cb signal_cb; + struct dma_fence_cb pre_pt_cb; + struct drm_syncobj *syncobj; + u64 value; + struct list_head list; +}; + /***
drm_syncobj_find- lookup and reference a sync object.
* @file_private: drm file private pointerdrivers/gpu/drm/drm_syncobj.c +18
-0@@ -137,6 +175,150 @@ void drm_syncobj_remove_callback(structdrm_syncobj *syncobj, spin_unlock(&syncobj->lock); } +static void drm_syncobj_timeline_signal_wait_pts(struct drm_syncobj *syncobj) +{ + struct rb_node *node = NULL; + struct drm_syncobj_wait_pt *wait_pt = NULL; + + spin_lock(&syncobj->lock); + for(node = rb_first(&syncobj->syncobj_timeline.wait_pt_tree); + node != NULL; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node = rb_next(node); + if (wait_pt->value <= syncobj->syncobj_timeline.timeline) { + dma_fence_signal(&wait_pt->base.base); + rb_erase(&wait_pt->node, + &syncobj->syncobj_timeline.wait_pt_tree); + RB_CLEAR_NODE(&wait_pt->node); + /* kfree(wait_pt) is excuted by fence put */ + dma_fence_put(&wait_pt->base.base); + } else { + /* the loop is from left to right, the later entryvalue is
+ * bigger, so don't need to check any more */ + break;
+ }
+ }
+spin_unlock(&syncobj->lock);drivers/gpu/drm/drm_syncobj.c +50
-0+} + + +static void pt_fence_cb (struct drm_syncobj_signal_pt *signal_pt) +{ + struct dma_fence *fence = NULL; + struct drm_syncobj *syncobj; + + fence = signal_pt->signal_fence; + signal_pt->signal_fence = NULL; + dma_fence_put(fence); + fence = signal_pt->pre_pt_base; + signal_pt->pre_pt_base = NULL; + dma_fence_put(fence); + + syncobj = signal_pt->syncobj; + spin_lock(&syncobj->lock); + list_del(&signal_pt->list); + syncobj->syncobj_timeline.timeline = signal_pt->value; + spin_unlock(&syncobj->lock); + /* kfree(signal_pt) will be executed by below fence put */ + dma_fence_put(&signal_pt->base.base); + drm_syncobj_timeline_signal_wait_pts(syncobj); +} +static void pt_signal_fence_func (struct dma_fence *fence, + struct dma_fence_cb *cb) +{ + struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, signal_cb); + + if (signal_pt->pre_pt_base && + !dma_fence_is_signaled(signal_pt->pre_pt_base)) + return; + + pt_fence_cb(signal_pt); +} +static void pt_pre_fence_func (struct dma_fence *fence, + struct dma_fence_cb *cb) +{ + struct drm_syncobj_signal_pt *signal_pt = + container_of(cb, struct drm_syncobj_signal_pt, pre_pt_cb); + + if (signal_pt->signal_fence && + !dma_fence_is_signaled(signal_pt->pre_pt_base)) + return; + + pt_fence_cb(signal_pt); +} + +static int drm_syncobj_timeline_replace_fence(struct drm_syncobj*syncobj,
+ structdma_fence*fence, + u64 point)drivers/gpu/drm/drm_syncobj.c +26
-0+{ + struct drm_syncobj_signal_pt *signal_pt = + kzalloc(sizeof(struct drm_syncobj_signal_pt), GFP_KERNEL); + struct drm_syncobj_signal_pt *tail_pt; + struct dma_fence *tail_pt_fence = NULL; + int ret = 0; + + if (!signal_pt) + return -ENOMEM; + if (syncobj->syncobj_timeline.signal_point >= point) { + DRM_WARN("A later signal is ready!"); + goto out; + } + if (fence) + dma_fence_get(fence); + spin_lock(&syncobj->lock); + spin_lock_init(&signal_pt->base.lock); + dma_fence_init(&signal_pt->base.base, + &drm_syncobj_stub_fence_ops, + &signal_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + signal_pt->signal_fence = + rcu_dereference_protected(fence, + lockdep_is_held(&fence->lock)); + if (!list_empty(&syncobj->syncobj_timeline.signal_pt_list)) { + tail_pt =list_last_entry(&syncobj->syncobj_timeline.signal_pt_list, + struct
drm_syncobj_signal_pt, list); +tail_pt_fence=&tail_pt->base.base;
+ if (dma_fence_is_signaled(tail_pt_fence))
+tail_pt_fence= NULL;
+ }
+ if (tail_pt_fence)
+signal_pt->pre_pt_base=
+ dma_fence_get(rcu_dereference_protected(tail_pt_fence,
+lockdep_is_held(&tail_pt_fence->lock)));
+
+signal_pt->value= point;
+syncobj->syncobj_timeline.signal_point= point;
+signal_pt->syncobj= syncobj;
+INIT_LIST_HEAD(&signal_pt->list);
+list_add_tail(&signal_pt->list, &syncobj->syncobj_timeline.signal_pt_list);
+spin_unlock(&syncobj->lock);
+wake_up_all(&syncobj->syncobj_timeline.wq);
+ /**
+ * Every pt is depending on signal fence and previous pt fence, add
+ * callbacks to them
+ */
+ if (!dma_fence_is_signaled(signal_pt->signal_fence)) + dma_fence_add_callback(signal_pt->signal_fence, +&signal_pt->signal_cb,
+pt_signal_fence_func);
+ else
+ pt_signal_fence_func(signal_pt->signal_fence,
+&signal_pt->signal_cb);
+ if (signal_pt->pre_pt_base&& !dma_fence_is_signaled(signal_pt->pre_pt_base))
+ dma_fence_add_callback(signal_pt->pre_pt_base,
+&signal_pt->pre_pt_cb,
+pt_pre_fence_func);
+ else
+pt_pre_fence_func(signal_pt->pre_pt_base, &signal_pt->pre_pt_cb);drivers/gpu/drm/drm_syncobj.c +8
-0+ + + return 0; +out: + kfree(signal_pt); + return ret; +} +/**
*drm_syncobj_replace_fence- replace fence in a sync object.
* @syncobj: Sync object to replace fence indrivers/gpu/drm/drm_syncobj.c +4
-0@@ -152,6 +334,11 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *old_fence; struct drm_syncobj_cb *cur, *tmp; + if (syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE) { + drm_syncobj_timeline_replace_fence(syncobj, fence, + point); + return; + } if (fence) dma_fence_get(fence);@@ -174,28 +361,6 @@ void drm_syncobj_replace_fence(struct
drm_syncobj*syncobj, }
EXPORT_SYMBOL(drm_syncobj_replace_fence);
-structdrm_syncobj_stub_fence{
- structdma_fencebase;
-spinlock_tlock;drivers/gpu/drm/drm_syncobj.c +0
-3-}; - -static const char *drm_syncobj_stub_fence_get_name(struct dma_fence*fence)
drivers/gpu/drm/drm_syncobj.c +0
-5-{ - return "syncobjstub"; -} - -static bool drm_syncobj_stub_fence_enable_signaling(struct
dma_fence*fence)drivers/gpu/drm/drm_syncobj.c +0
-11-{ - return !dma_fence_is_signaled(fence); -} - -static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { - .get_driver_name = drm_syncobj_stub_fence_get_name, - .get_timeline_name = drm_syncobj_stub_fence_get_name, - .enable_signaling = drm_syncobj_stub_fence_enable_signaling, - .release = NULL, -}; -static int
drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj){
structdrm_syncobj_stub_fence*fence;drivers/gpu/drm/drm_syncobj.c +0
-0@@ -215,6 +380,121 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) return 0; }+static struct
drm_syncobj_wait_pt* +drm_syncobj_timeline_lookup_wait_pt(structdrm_syncobj*syncobj, u64 point)
+{
+ structrb_node*node =syncobj->syncobj_timeline.wait_pt_tree.rb_node;
+ structdrm_syncobj_wait_pt*wait_pt= NULL;drivers/gpu/drm/drm_syncobj.c +21
-0+ + + spin_lock(&syncobj->lock); + while(node) { + int result = point - wait_pt->value; + + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + if (result < 0) + node = node->rb_left; + else if (result > 0) + node = node->rb_right; + else + break; + } + spin_unlock(&syncobj->lock); + + return wait_pt; +} + +static struct drm_syncobj_wait_pt * +drm_syncobj_timeline_create_wait_pt(struct drm_syncobj *syncobj,u64 point)
+{
+ structdrm_syncobj_wait_pt*wait_pt;
+ structrb_node**new = &(syncobj->syncobj_timeline.wait_pt_tree.rb_node), *parent = NULL;drivers/gpu/drm/drm_syncobj.c +12
-0+ + wait_pt = kzalloc(sizeof(*wait_pt), GFP_KERNEL); + if (!wait_pt) + return NULL; + spin_lock_init(&wait_pt->base.lock); + dma_fence_init(&wait_pt->base.base, + &drm_syncobj_stub_fence_ops, + &wait_pt->base.lock, + syncobj->syncobj_timeline.timeline_context, point); + wait_pt->value = point; + + /* wait pt must be in an order, so that we can easily lookupand signal
+ * it */
+spin_lock(&syncobj->lock);
+ if (point <=syncobj->syncobj_timeline.timeline) +dma_fence_signal(&wait_pt->base.base);
+while(*new){
+ structdrm_syncobj_wait_pt*this =
+rb_entry(*new, struct drm_syncobj_wait_pt, node); + int result =wait_pt->value-this->value;drivers/gpu/drm/drm_syncobj.c +12
-0+ + parent = *new; + if (result < 0) + new = &((*new)->rb_left); + else if (result > 0) + new = &((*new)->rb_right); + else + goto exist; + } + + rb_link_node(&wait_pt->node, parent, new); + rb_insert_color(&wait_pt->node,
&syncobj->syncobj_timeline.wait_pt_tree);
+spin_unlock(&syncobj->lock);
+ returnwait_pt;drivers/gpu/drm/drm_syncobj.c +9
-0+exist: + spin_unlock(&syncobj->lock); + dma_fence_put(&wait_pt->base.base); + wait_pt = drm_syncobj_timeline_lookup_wait_pt(syncobj, point); + return wait_pt; +} + +static struct dma_fence * +drm_syncobj_timeline_point_get(struct drm_syncobj *syncobj, u64point, u64 flag)
drivers/gpu/drm/drm_syncobj.c +31
-0+{ + struct drm_syncobj_wait_pt *wait_pt; + + /* already signaled, simply return a signaled stub fence */ + if (point <= syncobj->syncobj_timeline.timeline) { + struct drm_syncobj_stub_fence *fence; + + fence = kzalloc(sizeof(*fence), GFP_KERNEL); + if (fence == NULL) + return NULL; + + spin_lock_init(&fence->lock); + dma_fence_init(&fence->base, &drm_syncobj_stub_fence_ops, + &fence->lock, 0, 0); + dma_fence_signal(&fence->base); + return &fence->base; + } + + /* check if the wait pt exists */ + wait_pt = drm_syncobj_timeline_lookup_wait_pt(syncobj, point); + if (!wait_pt) { + /* This is a new wait pt, so create it */ + wait_pt = drm_syncobj_timeline_create_wait_pt(syncobj, point); + if (!wait_pt) + return NULL; + } + if (wait_pt) { + struct dma_fence *fence; + int ret = + wait_event_interruptible_timeout(syncobj->syncobj_timeline.wq, + wait_pt->value <=
syncobj->syncobj_timeline.signal_point,
+msecs_to_jiffies(10000)); /* wait 10s */drivers/gpu/drm/drm_syncobj.c +11
-0+ + if (ret <= 0) + return NULL; + rcu_read_lock(); + fence = dma_fence_get_rcu(&wait_pt->base.base); + rcu_read_unlock(); + return fence; + } + return NULL; +} +/**
*drm_syncobj_find_fence- lookup and reference the fence in a sync object
* @file_private: drm file private pointerdrivers/gpu/drm/drm_syncobj.c +11
-0@@ -240,7 +520,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private, if (!syncobj) return -ENOENT; - *fence = drm_syncobj_fence_get(syncobj); + if (syncobj->type == DRM_SYNCOBJ_TYPE_NORMAL) { + /* NORMAL syncobj doesn't care point value */ + WARN_ON(point != 0); + *fence = drm_syncobj_fence_get(syncobj); + } else if (syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE) { + *fence = drm_syncobj_timeline_point_get(syncobj, point, +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ); + } else { + DRM_ERROR("Don't support this type syncobj\n"); + *fence = NULL; + } if (!*fence) { ret = -EINVAL;}
drivers/gpu/drm/drm_syncobj.c +27
-0@@ -249,6 +539,34 @@ int drm_syncobj_find_fence(struct drm_file *file_private, } EXPORT_SYMBOL(drm_syncobj_find_fence); +static void drm_syncobj_timeline_fini(struct drm_syncobj *syncobj, + struct drm_syncobj_timeline *syncobj_timeline) +{ + struct rb_node *node = NULL; + struct drm_syncobj_wait_pt *wait_pt = NULL; + struct drm_syncobj_signal_pt *signal_pt = NULL, *tmp; + + spin_lock(&syncobj->lock); + for(node = rb_first(&syncobj_timeline->wait_pt_tree); + node != NULL; ) { + wait_pt = rb_entry(node, struct drm_syncobj_wait_pt, node); + node = rb_next(node); + rb_erase(&wait_pt->node, + &syncobj_timeline->wait_pt_tree); + RB_CLEAR_NODE(&wait_pt->node); + /* kfree(wait_pt) is excuted by fence put */ + dma_fence_put(&wait_pt->base.base); + } + list_for_each_entry_safe(signal_pt, tmp, + &syncobj_timeline->signal_pt_list, list) { + list_del(&signal_pt->list); + dma_fence_put(signal_pt->signal_fence); + dma_fence_put(signal_pt->pre_pt_base); + dma_fence_put(&signal_pt->base.base); + } + spin_unlock(&syncobj->lock); +} + /*** drm_syncobj_free - free a sync object. * @kref: kref to free.
drivers/gpu/drm/drm_syncobj.c +1
-0@@ -261,10 +579,23 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj, refcount); drm_syncobj_replace_fence(syncobj, NULL, 0); + drm_syncobj_timeline_fini(syncobj, &syncobj->syncobj_timeline); kfree(syncobj); } EXPORT_SYMBOL(drm_syncobj_free);+static void
drm_syncobj_timeline_init(struct drm_syncobj_timeline + *syncobj_timeline)drivers/gpu/drm/drm_syncobj.c +10
-0+{ + syncobj_timeline->timeline_context = dma_fence_context_alloc(1); + syncobj_timeline->timeline = 0; + syncobj_timeline->signal_point = 0; + init_waitqueue_head(&syncobj_timeline->wq); + + syncobj_timeline->wait_pt_tree = RB_ROOT; + INIT_LIST_HEAD(&syncobj_timeline->signal_pt_list); +} +/**
*drm_syncobj_create- create a new syncobj
* @out_syncobj: returned syncobjdrivers/gpu/drm/drm_syncobj.c +6
-0@@ -290,6 +621,12 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags, kref_init(&syncobj->refcount); INIT_LIST_HEAD(&syncobj->cb_list); spin_lock_init(&syncobj->lock); + if (flags & DRM_SYNCOBJ_CREATE_TYPE_TIMELINE) { + syncobj->type = DRM_SYNCOBJ_TYPE_TIMELINE; +drm_syncobj_timeline_init (&syncobj->syncobj_timeline); + } else { + syncobj->type = DRM_SYNCOBJ_TYPE_NORMAL; + } if (flags & DRM_SYNCOBJ_CREATE_SIGNALED) { ret = drm_syncobj_assign_null_handle(syncobj);include/drm/drm_syncobj.h +27
-0@@ -30,6 +30,25 @@ struct drm_syncobj_cb; +enum drm_syncobj_type { + DRM_SYNCOBJ_TYPE_NORMAL, + DRM_SYNCOBJ_TYPE_TIMELINE +}; + +struct drm_syncobj_timeline { + wait_queue_head_t wq; + u64 timeline_context; + /** + * @timeline: syncobj timeline + */ + u64 timeline; + u64 signal_point; + + + struct rb_root wait_pt_tree; + struct list_head signal_pt_list; +}; + /*** struct drm_syncobj - sync object. * @@ -40,6 +59,15 @@ struct drm_syncobj {* @refcount: Reference count of this object. */ struct kref refcount; + /** + * @type: indicate syncobj type + */ + enum drm_syncobj_type type; + /** + * @syncobj_timeline: timeline + */ + struct drm_syncobj_timeline syncobj_timeline; + /*** @fence: * NULL or a pointer to the fence bound to this object. include/uapi/drm/drm.h +0
-1--- a/include/uapi/drm/drm.hQuoted 9 lines
include/uapi/drm/drm.h struct drm_prime_handle { · line 722
Quoted 8 lines
+++
b/include/uapi/drm/drm.hinclude/uapi/drm/drm.h +1
-0@@ -717,6 +717,7 @@ struct drm_prime_handle { struct drm_syncobj_create { __u32 handle; #define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) +#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1) __u32 flags; };
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 5 lines
That is certainly totally nonsense.
dma_fence_enable_sw_signaling()is the function who is calling this callback.Signed-off-by Chunming Zhou <[email protected]>Cc Jason Ekstrand <[email protected]>
For this one: Reviewed-by: Christian König <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/drm_syncobj.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/drm_syncobj.c +0
-0
drivers/gpu/drm/drm_syncobj.c static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence) · line 189
Quoted 7 lines
drivers/gpu/drm/drm_syncobj.c +0
-1@@ -184,7 +184,6 @@ static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence)static bool drm_syncobj_null_fence_enable_signaling (struct dma_fence *fence) { -dma_fence_enable_sw_signaling (fence);return !dma_fence_is_signaled (fence); }
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 031985ce-bdae-c04d-5fd4-e4ec2416e878-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 10 lines · Christian König
Am 23.08.2018 um 10:25 schrieb Chunming Zhou:
Quoted 6 lines
That is certainly totally nonsense.
dma_fence_enable_sw_signaling()is the function who is calling this callback.Signed-off-by Chunming Zhou <[email protected]>Cc Jason Ekstrand <[email protected]>For this one: Reviewed-by: Christian König <[email protected]>
As mentioned in the v1 thread, you can outright nuke this, no longer needed. But this at least makes sense now. Ack either way. -Daniel
Quoted 24 lines
Quoted 11 lines
--- drivers/gpu/drm/drm_syncobj.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/drm_syncobj.c +0
-0drivers/gpu/drm/drm_syncobj.c static const char · line 189
Quoted 7 lines
drivers/gpu/drm/drm_syncobj.c +0
-1@@ -184,7 +184,6 @@ static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence)static bool drm_syncobj_null_fence_enable_signaling (struct dma_fence *fence) { -dma_fence_enable_sw_signaling (fence);return !dma_fence_is_signaled (fence); }_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx