On 2018å¹´09æ??19æ?¥ 15:18, Christian König wrote:
> Am 19.09.2018 um 06:26 schrieb Chunming Zhou:
[snip]
>> Â Â Â Â Â Â Â Â Â *fence = NULL;
>> Â Â Â Â Â Â Â Â Â drm_syncobj_add_callback_locked(syncobj, cb, func);
>> @@ -164,6 +177,153 @@ void drm_syncobj_remove_callback(struct
>> drm_syncobj *syncobj,
>> Â Â Â Â Â spin_unlock(&syncobj->lock);
>> Â }
>> Â +static void drm_syncobj_timeline_init(struct drm_syncobj *syncobj)
>
> We still have _timeline_ in the name here.
the func is relevant to timeline members, or which name is proper?
>
>> +{
>> +Â Â Â spin_lock(&syncobj->lock);
>> +Â Â Â syncobj->timeline_context = dma_fence_context_alloc(1);
[snip]
>> +}
>> +
>> +int drm_syncobj_lookup_fence(struct drm_syncobj *syncobj, u64 point,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct dma_fence **fence) {
>> +
>> +Â Â Â return drm_syncobj_search_fence(syncobj, point,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT,
>
> I still have a bad feeling setting that flag as default cause it might
> change the behavior for the UAPI.
>
> Maybe export drm_syncobj_search_fence directly? E.g. with the flags
> parameter.
previous v5 indeed do this, you let me wrap it, need change back?
Regards,
David Zhou
>
> Regards,
> Christian.
>
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â fence);
>> +}
>> +EXPORT_SYMBOL(drm_syncobj_lookup_fence);
>> +
>> Â /**
>> Â Â * drm_syncobj_find_fence - lookup and reference the fence in a
>> sync object
>> Â Â * @file_private: drm file private pointer
>> @@ -228,7 +443,7 @@ static int drm_syncobj_assign_null_handle(struct
>> drm_syncobj *syncobj)
>> Â Â * @fence: out parameter for the fence
>> Â Â *
>> Â Â * This is just a convenience function that combines
>> drm_syncobj_find() and
>> - * drm_syncobj_fence_get().
>> + * drm_syncobj_lookup_fence().
>> Â Â *
>> Â Â * Returns 0 on success or a negative error value on failure. On
>> success @fence
>> Â Â * contains a reference to the fence, which must be released by
>> calling
>> @@ -236,18 +451,11 @@ static int
>> drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)
>> Â Â */
>> Â int drm_syncobj_find_fence(struct drm_file *file_private,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â u32 handle, u64 point,
>> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct dma_fence **fence)
>> -{
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct dma_fence **fence) {
>> Â Â Â Â Â struct drm_syncobj *syncobj = drm_syncobj_find(file_private,
>> handle);
>> -Â Â Â int ret = 0;
>> -
>> -Â Â Â if (!syncobj)
>> -Â Â Â Â Â Â Â return -ENOENT;
>> +Â Â Â int ret;
>> Â -Â Â Â *fence = drm_syncobj_fence_get(syncobj);
>> -Â Â Â if (!*fence) {
>> -Â Â Â Â Â Â Â ret = -EINVAL;
>> -Â Â Â }
>> +Â Â Â ret = drm_syncobj_lookup_fence(syncobj, point, fence);
>> Â Â Â Â Â drm_syncobj_put(syncobj);
>> Â Â Â Â Â return ret;
>> Â }
>> @@ -264,7 +472,7 @@ void drm_syncobj_free(struct kref *kref)
>> Â Â Â Â Â struct drm_syncobj *syncobj = container_of(kref,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct drm_syncobj,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â refcount);
>> -Â Â Â drm_syncobj_replace_fence(syncobj, 0, NULL);
>> +Â Â Â drm_syncobj_timeline_fini(syncobj);
>> Â Â Â Â Â kfree(syncobj);
>> Â }
>> Â EXPORT_SYMBOL(drm_syncobj_free);
>> @@ -294,6 +502,11 @@ 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;
>> +Â Â Â else
>> +Â Â Â Â Â Â Â syncobj->type = DRM_SYNCOBJ_TYPE_INDIVIDUAL;
>> +Â Â Â drm_syncobj_timeline_init(syncobj);
>> Â Â Â Â Â Â if (flags & DRM_SYNCOBJ_CREATE_SIGNALED) {
>> Â Â Â Â Â Â Â Â Â ret = drm_syncobj_assign_null_handle(syncobj);
>> @@ -576,7 +789,8 @@ drm_syncobj_create_ioctl(struct drm_device *dev,
>> void *data,
>> Â Â Â Â Â Â Â Â Â return -ENODEV;
>> Â Â Â Â Â Â /* no valid flags yet */
>> -Â Â Â if (args->flags & ~DRM_SYNCOBJ_CREATE_SIGNALED)
>> +Â Â Â if (args->flags & ~(DRM_SYNCOBJ_CREATE_SIGNALED |
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â DRM_SYNCOBJ_CREATE_TYPE_TIMELINE))
>> Â Â Â Â Â Â Â Â Â return -EINVAL;
>> Â Â Â Â Â Â return drm_syncobj_create_as_handle(file_private,
>> @@ -669,9 +883,8 @@ static void syncobj_wait_syncobj_func(struct
>> drm_syncobj *syncobj,
>> Â Â Â Â Â struct syncobj_wait_entry *wait =
>> Â Â Â Â Â Â Â Â Â container_of(cb, struct syncobj_wait_entry, syncobj_cb);
>> Â -Â Â Â /* This happens inside the syncobj lock */
>> -Â Â Â wait->fence =
>> dma_fence_get(rcu_dereference_protected(syncobj->fence,
>> - lockdep_is_held(&syncobj->lock)));
>> +Â Â Â drm_syncobj_search_fence(syncobj, 0, 0, &wait->fence);
>> +
>> Â Â Â Â Â wake_up_process(wait->task);
>> Â }
>> Â @@ -698,7 +911,8 @@ static signed long
>> drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs,
>> Â Â Â Â Â signaled_count = 0;
>> Â Â Â Â Â for (i = 0; i < count; ++i) {
>> Â Â Â Â Â Â Â Â Â entries[i].task = current;
>> -Â Â Â Â Â Â Â entries[i].fence = drm_syncobj_fence_get(syncobjs[i]);
>> +Â Â Â Â Â Â Â ret = drm_syncobj_search_fence(syncobjs[i], 0, 0,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &entries[i].fence);
>> Â Â Â Â Â Â Â Â Â if (!entries[i].fence) {
>> Â Â Â Â Â Â Â Â Â Â Â Â Â if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) {
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â continue;
>> @@ -970,12 +1184,19 @@ drm_syncobj_reset_ioctl(struct drm_device
>> *dev, void *data,
>> Â Â Â Â Â if (ret < 0)
>> Â Â Â Â Â Â Â Â Â return ret;
>> Â -Â Â Â for (i = 0; i < args->count_handles; i++)
>> -Â Â Â Â Â Â Â drm_syncobj_replace_fence(syncobjs[i], 0, NULL);
>> -
>> +Â Â Â for (i = 0; i < args->count_handles; i++) {
>> +Â Â Â Â Â Â Â if (syncobjs[i]->type == DRM_SYNCOBJ_TYPE_TIMELINE) {
>> +Â Â Â Â Â Â Â Â Â Â Â DRM_ERROR("timeline syncobj cannot reset!\n");
>> +Â Â Â Â Â Â Â Â Â Â Â ret = -EINVAL;
>> +Â Â Â Â Â Â Â Â Â Â Â goto out;
>> +Â Â Â Â Â Â Â }
>> +Â Â Â Â Â Â Â drm_syncobj_timeline_fini(syncobjs[i]);
>> +Â Â Â Â Â Â Â drm_syncobj_timeline_init(syncobjs[i]);
>> +Â Â Â }
>> +out:
>> Â Â Â Â Â drm_syncobj_array_free(syncobjs, args->count_handles);
>> Â -Â Â Â return 0;
>> +Â Â Â return ret;
>> Â }
>> Â Â int
>> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> index 0a8d2d64f380..a040fa3281df 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> @@ -2137,7 +2137,7 @@ await_fence_array(struct i915_execbuffer *eb,
>> Â Â Â Â Â Â Â Â Â if (!(flags & I915_EXEC_FENCE_WAIT))
>> Â Â Â Â Â Â Â Â Â Â Â Â Â continue;
>> Â -Â Â Â Â Â Â Â fence = drm_syncobj_fence_get(syncobj);
>> +Â Â Â Â Â Â Â drm_syncobj_lookup_fence(syncobj, 0, &fence);
>> Â Â Â Â Â Â Â Â Â if (!fence)
>> Â Â Â Â Â Â Â Â Â Â Â Â Â return -EINVAL;
>> Â diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h
>> index 425432b85a87..6dac479fedfe 100644
>> --- a/include/drm/drm_syncobj.h
>> +++ b/include/drm/drm_syncobj.h
>> @@ -30,6 +30,11 @@
>> Â Â struct drm_syncobj_cb;
>> Â +enum drm_syncobj_type {
>> +Â Â Â DRM_SYNCOBJ_TYPE_INDIVIDUAL,
>> +Â Â Â DRM_SYNCOBJ_TYPE_TIMELINE
>> +};
>> +
>> Â /**
>> Â Â * struct drm_syncobj - sync object.
>> Â Â *
>> @@ -41,19 +46,36 @@ struct drm_syncobj {
>> Â Â Â Â Â Â */
>> Â Â Â Â Â struct kref refcount;
>> Â Â Â Â Â /**
>> -Â Â Â Â * @fence:
>> -Â Â Â Â * NULL or a pointer to the fence bound to this object.
>> -Â Â Â Â *
>> -Â Â Â Â * This field should not be used directly. Use
>> drm_syncobj_fence_get()
>> -Â Â Â Â * and drm_syncobj_replace_fence() instead.
>> +Â Â Â Â * @type: indicate syncobj type
>> +Â Â Â Â */
>> +Â Â Â enum drm_syncobj_type type;
>> +Â Â Â /**
>> +Â Â Â Â * @wq: wait signal operation work queue
>> +Â Â Â Â */
>> +   wait_queue_head_t   wq;
>> +Â Â Â /**
>> +Â Â Â Â * @timeline_context: fence context used by timeline
>> Â Â Â Â Â Â */
>> -Â Â Â struct dma_fence __rcu *fence;
>> +Â Â Â u64 timeline_context;
>> Â Â Â Â Â /**
>> -Â Â Â Â * @cb_list: List of callbacks to call when the &fence gets
>> replaced.
>> +Â Â Â Â * @timeline: syncobj timeline value, which indicates point is
>> signaled.
>> Â Â Â Â Â Â */
>> +Â Â Â u64 timeline;
>> +Â Â Â /**
>> +Â Â Â Â * @signal_point: which indicates the latest signaler point.
>> +Â Â Â Â */
>> +Â Â Â u64 signal_point;
>> +Â Â Â /**
>> +Â Â Â Â * @signal_pt_list: signaler point list.
>> +Â Â Â Â */
>> +Â Â Â struct list_head signal_pt_list;
>> +
>> +Â Â Â /**
>> +Â Â Â Â Â Â Â Â * @cb_list: List of callbacks to call when the &fence gets
>> replaced.
>> +Â Â Â Â Â Â Â Â */
>> Â Â Â Â Â struct list_head cb_list;
>> Â Â Â Â Â /**
>> -Â Â Â Â * @lock: Protects &cb_list and write-locks &fence.
>> +Â Â Â Â * @lock: Protects syncobj list and write-locks &fence.
>> Â Â Â Â Â Â */
>> Â Â Â Â Â spinlock_t lock;
>> Â Â Â Â Â /**
>> @@ -68,7 +90,7 @@ typedef void (*drm_syncobj_func_t)(struct
>> drm_syncobj *syncobj,
>> Â /**
>> Â Â * struct drm_syncobj_cb - callback for drm_syncobj_add_callback
>> Â Â * @node: used by drm_syncob_add_callback to append this struct to
>> - *Â Â Â Â Â &drm_syncobj.cb_list
>> + *Â Â Â Â Â Â &drm_syncobj.cb_list
>> Â Â * @func: drm_syncobj_func_t to call
>> Â Â *
>> Â Â * This struct will be initialized by drm_syncobj_add_callback,
>> additional
>> @@ -106,29 +128,6 @@ drm_syncobj_put(struct drm_syncobj *obj)
>> Â Â Â Â Â kref_put(&obj->refcount, drm_syncobj_free);
>> Â }
>> Â -/**
>> - * drm_syncobj_fence_get - get a reference to a fence in a sync object
>> - * @syncobj: sync object.
>> - *
>> - * This acquires additional reference to &drm_syncobj.fence
>> contained in @obj,
>> - * if not NULL. It is illegal to call this without already holding a
>> reference.
>> - * No locks required.
>> - *
>> - * Returns:
>> - * Either the fence of @obj or NULL if there's none.
>> - */
>> -static inline struct dma_fence *
>> -drm_syncobj_fence_get(struct drm_syncobj *syncobj)
>> -{
>> -Â Â Â struct dma_fence *fence;
>> -
>> -Â Â Â rcu_read_lock();
>> -Â Â Â fence = dma_fence_get_rcu_safe(&syncobj->fence);
>> -Â Â Â rcu_read_unlock();
>> -
>> -Â Â Â return fence;
>> -}
>> -
>> Â struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â u32 handle);
>> Â void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, u64 point,
>> @@ -142,5 +141,7 @@ int drm_syncobj_create(struct drm_syncobj
>> **out_syncobj, uint32_t flags,
>> Â int drm_syncobj_get_handle(struct drm_file *file_private,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct drm_syncobj *syncobj, u32 *handle);
>> Â int drm_syncobj_get_fd(struct drm_syncobj *syncobj, int *p_fd);
>> +int drm_syncobj_lookup_fence(struct drm_syncobj *syncobj, u64 point,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct dma_fence **fence);
>> Â Â #endif
>> diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
>> index 300f336633f2..cebdb2541eb7 100644
>> --- a/include/uapi/drm/drm.h
>> +++ b/include/uapi/drm/drm.h
>> @@ -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;
>> Â };
>
