openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: revert "expand replace_fence to support timeline point v2" 

This reverts commit 9a09a42369.

The whole interface isn't thought through. Since this function can't
fail we actually can't allocate an object to store the sync point.

Sorry, I should have taken the lead on this from the very beginning and
reviewed it more thoughtfully. Going to propose a new interface as a
follow up change.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Link: https://patchwork.freedesktop.org/patch/265580/
This commit is contained in:
Christian König 2018-11-14 14:24:27 +01:00
parent 5ff75c489c
commit 0b258ed1a2
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
View File

@ -1193,7 +1193,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)
int i; int i;
for (i = 0; i < p->num_post_dep_syncobjs; ++i) for (i = 0; i < p->num_post_dep_syncobjs; ++i)
drm_syncobj_replace_fence(p->post_dep_syncobjs[i], 0, p->fence); drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence);
} }
static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,

14
drivers/gpu/drm/drm_syncobj.c
View File

@ -140,13 +140,11 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj,
/** /**
* drm_syncobj_replace_fence - replace fence in a sync object. * drm_syncobj_replace_fence - replace fence in a sync object.
* @syncobj: Sync object to replace fence in * @syncobj: Sync object to replace fence in
* @point: timeline point
* @fence: fence to install in sync file. * @fence: fence to install in sync file.
* *
* This replaces the fence on a sync object, or a timeline point fence. * This replaces the fence on a sync object.
*/ */
void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
u64 point,
struct dma_fence *fence) struct dma_fence *fence)
{ {
struct dma_fence *old_fence; struct dma_fence *old_fence;
@ -184,7 +182,7 @@ static void drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)
{ {
struct dma_fence *fence = dma_fence_get_stub(); struct dma_fence *fence = dma_fence_get_stub();
drm_syncobj_replace_fence(syncobj, 0, fence); drm_syncobj_replace_fence(syncobj, fence);
dma_fence_put(fence); dma_fence_put(fence);
} }
@ -233,7 +231,7 @@ void drm_syncobj_free(struct kref *kref)
struct drm_syncobj *syncobj = container_of(kref, struct drm_syncobj *syncobj = container_of(kref,
struct drm_syncobj, struct drm_syncobj,
refcount); refcount);
drm_syncobj_replace_fence(syncobj, 0, NULL); drm_syncobj_replace_fence(syncobj, NULL);
kfree(syncobj); kfree(syncobj);
} }
EXPORT_SYMBOL(drm_syncobj_free); EXPORT_SYMBOL(drm_syncobj_free);
@ -267,7 +265,7 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
drm_syncobj_assign_null_handle(syncobj); drm_syncobj_assign_null_handle(syncobj);
if (fence) if (fence)
drm_syncobj_replace_fence(syncobj, 0, fence); drm_syncobj_replace_fence(syncobj, fence);
*out_syncobj = syncobj; *out_syncobj = syncobj;
return 0; return 0;
@ -452,7 +450,7 @@ static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
return -ENOENT; return -ENOENT;
} }
drm_syncobj_replace_fence(syncobj, 0, fence); drm_syncobj_replace_fence(syncobj, fence);
dma_fence_put(fence); dma_fence_put(fence);
drm_syncobj_put(syncobj); drm_syncobj_put(syncobj);
return 0; return 0;
@ -923,7 +921,7 @@ drm_syncobj_reset_ioctl(struct drm_device *dev, void *data,
return ret; return ret;
for (i = 0; i < args->count_handles; i++) for (i = 0; i < args->count_handles; i++)
drm_syncobj_replace_fence(syncobjs[i], 0, NULL); drm_syncobj_replace_fence(syncobjs[i], NULL);
drm_syncobj_array_free(syncobjs, args->count_handles); drm_syncobj_array_free(syncobjs, args->count_handles);

2
drivers/gpu/drm/i915/i915_gem_execbuffer.c
View File

@ -2191,7 +2191,7 @@ signal_fence_array(struct i915_execbuffer *eb,
if (!(flags & I915_EXEC_FENCE_SIGNAL)) if (!(flags & I915_EXEC_FENCE_SIGNAL))
continue; continue;
drm_syncobj_replace_fence(syncobj, 0, fence); drm_syncobj_replace_fence(syncobj, fence);
} }
} }

3
drivers/gpu/drm/v3d/v3d_gem.c
View File

@ -609,8 +609,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
/* Update the return sync object for the */ /* Update the return sync object for the */
sync_out = drm_syncobj_find(file_priv, args->out_sync); sync_out = drm_syncobj_find(file_priv, args->out_sync);
if (sync_out) { if (sync_out) {
drm_syncobj_replace_fence(sync_out, 0, drm_syncobj_replace_fence(sync_out, exec->render_done_fence);
exec->render_done_fence);
drm_syncobj_put(sync_out); drm_syncobj_put(sync_out);
} }

2
drivers/gpu/drm/vc4/vc4_gem.c
View File

@ -681,7 +681,7 @@ vc4_queue_submit(struct drm_device *dev, struct vc4_exec_info *exec,
exec->fence = &fence->base; exec->fence = &fence->base;
if (out_sync) if (out_sync)
drm_syncobj_replace_fence(out_sync, 0, exec->fence); drm_syncobj_replace_fence(out_sync, exec->fence);
vc4_update_bo_seqnos(exec, seqno); vc4_update_bo_seqnos(exec, seqno);

2
include/drm/drm_syncobj.h
View File

@ -131,7 +131,7 @@ drm_syncobj_fence_get(struct drm_syncobj *syncobj)
struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,
u32 handle); u32 handle);
void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, u64 point, void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
struct dma_fence *fence); struct dma_fence *fence);
int drm_syncobj_find_fence(struct drm_file *file_private, int drm_syncobj_find_fence(struct drm_file *file_private,
u32 handle, u64 point, u64 flags, u32 handle, u64 point, u64 flags,