Commit 649fdce2 authored by Chunming Zhou's avatar Chunming Zhou Committed by Christian König

drm: add flags to drm_syncobj_find_fence

flags can be used by driver to decide whether need to block wait submission.
Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
SIgned-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.kernel.org/patch/10641339/
parent 7bd01a08
...@@ -1104,7 +1104,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, ...@@ -1104,7 +1104,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p,
{ {
int r; int r;
struct dma_fence *fence; struct dma_fence *fence;
r = drm_syncobj_find_fence(p->filp, handle, 0, &fence); r = drm_syncobj_find_fence(p->filp, handle, 0, 0, &fence);
if (r) if (r)
return r; return r;
......
...@@ -224,7 +224,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) ...@@ -224,7 +224,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)
* dma_fence_put(). * dma_fence_put().
*/ */
int drm_syncobj_find_fence(struct drm_file *file_private, int drm_syncobj_find_fence(struct drm_file *file_private,
u32 handle, u64 point, u32 handle, u64 point, u64 flags,
struct dma_fence **fence) struct dma_fence **fence)
{ {
struct drm_syncobj *syncobj = drm_syncobj_find(file_private, handle); struct drm_syncobj *syncobj = drm_syncobj_find(file_private, handle);
...@@ -495,7 +495,7 @@ static int drm_syncobj_export_sync_file(struct drm_file *file_private, ...@@ -495,7 +495,7 @@ static int drm_syncobj_export_sync_file(struct drm_file *file_private,
if (fd < 0) if (fd < 0)
return fd; return fd;
ret = drm_syncobj_find_fence(file_private, handle, 0, &fence); ret = drm_syncobj_find_fence(file_private, handle, 0, 0, &fence);
if (ret) if (ret)
goto err_put_fd; goto err_put_fd;
......
...@@ -522,12 +522,12 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, ...@@ -522,12 +522,12 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
kref_init(&exec->refcount); kref_init(&exec->refcount);
ret = drm_syncobj_find_fence(file_priv, args->in_sync_bcl, ret = drm_syncobj_find_fence(file_priv, args->in_sync_bcl,
0, &exec->bin.in_fence); 0, 0, &exec->bin.in_fence);
if (ret == -EINVAL) if (ret == -EINVAL)
goto fail; goto fail;
ret = drm_syncobj_find_fence(file_priv, args->in_sync_rcl, ret = drm_syncobj_find_fence(file_priv, args->in_sync_rcl,
0, &exec->render.in_fence); 0, 0, &exec->render.in_fence);
if (ret == -EINVAL) if (ret == -EINVAL)
goto fail; goto fail;
......
...@@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data, ...@@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
if (args->in_sync) { if (args->in_sync) {
ret = drm_syncobj_find_fence(file_priv, args->in_sync, ret = drm_syncobj_find_fence(file_priv, args->in_sync,
0, &in_fence); 0, 0, &in_fence);
if (ret) if (ret)
goto fail; goto fail;
......
...@@ -134,7 +134,7 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, ...@@ -134,7 +134,7 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,
void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, u64 point, void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, u64 point,
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, u32 handle, u64 point, u64 flags,
struct dma_fence **fence); struct dma_fence **fence);
void drm_syncobj_free(struct kref *kref); void drm_syncobj_free(struct kref *kref);
int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags, int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment