Move the job of creating an input/exec fences (from a file descriptor)
out of i915_gem_do_execbuffer.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Signed-off-by: Matthew Brost <matthew.br...@intel.com>
---
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 75 +++++++++++--------
1 file changed, 43 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 70d352fc543f..0416bcb551b0 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -3146,11 +3146,12 @@ static int
i915_gem_do_execbuffer(struct drm_device *dev,
struct drm_file *file,
struct drm_i915_gem_execbuffer2 *args,
- struct drm_i915_gem_exec_object2 *exec)
+ struct drm_i915_gem_exec_object2 *exec,
+ struct dma_fence *in_fence,
+ struct dma_fence *exec_fence)
{
struct drm_i915_private *i915 = to_i915(dev);
struct i915_execbuffer eb;
- struct dma_fence *in_fence = NULL;
struct sync_file *out_fence = NULL;
struct i915_vma *batch;
int out_fence_fd = -1;
@@ -3197,25 +3198,10 @@ i915_gem_do_execbuffer(struct drm_device *dev,
if (err)
goto err_ext;
-#define IN_FENCES (I915_EXEC_FENCE_IN | I915_EXEC_FENCE_SUBMIT)
- if (args->flags & IN_FENCES) {
- if ((args->flags & IN_FENCES) == IN_FENCES)
- return -EINVAL;
-
- in_fence = sync_file_get_fence(lower_32_bits(args->rsvd2));
- if (!in_fence) {
- err = -EINVAL;
- goto err_ext;
- }
- }
-#undef IN_FENCES
-
if (args->flags & I915_EXEC_FENCE_OUT) {
out_fence_fd = get_unused_fd_flags(O_CLOEXEC);
- if (out_fence_fd < 0) {
- err = out_fence_fd;
- goto err_in_fence;
- }
+ if (out_fence_fd < 0)
+ goto err_ext;
}
err = eb_create(&eb);
@@ -3277,13 +3263,16 @@ i915_gem_do_execbuffer(struct drm_device *dev,
goto err_ext;
}
+ if (exec_fence) {
+ err = i915_request_await_execution(eb.request,
+ exec_fence);
+ if (err < 0)
+ goto err_request;
+ }
+
if (in_fence) {
- if (args->flags & I915_EXEC_FENCE_SUBMIT)
- err = i915_request_await_execution(eb.request,
- in_fence);
- else
- err = i915_request_await_dma_fence(eb.request,
- in_fence);
+ err = i915_request_await_dma_fence(eb.request,
+ in_fence);
if (err < 0)
goto err_request;
}
@@ -3363,8 +3352,6 @@ i915_gem_do_execbuffer(struct drm_device *dev,
err_out_fence:
if (out_fence_fd != -1)
put_unused_fd(out_fence_fd);
-err_in_fence:
- dma_fence_put(in_fence);
err_ext:
put_fence_array(eb.fences, eb.num_fences);
return err;
@@ -3395,6 +3382,8 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void
*data,
struct drm_i915_private *i915 = to_i915(dev);
struct drm_i915_gem_execbuffer2 *args = data;
struct drm_i915_gem_exec_object2 *exec2_list;
+ struct dma_fence *in_fence = NULL;
+ struct dma_fence *exec_fence = NULL;
const size_t count = args->buffer_count;
int err;
@@ -3419,13 +3408,33 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void
*data,
if (err)
return err;
+ if (args->flags & I915_EXEC_FENCE_IN) {
+ in_fence = sync_file_get_fence(lower_32_bits(args->rsvd2));
+ if (!in_fence)
+ return -EINVAL;
+ }
+
+ if (args->flags & I915_EXEC_FENCE_SUBMIT) {
+ if (in_fence) {
+ err = -EINVAL;
+ goto err_exec_fence;
+ }
+
+ exec_fence = sync_file_get_fence(lower_32_bits(args->rsvd2));
+ if (!exec_fence) {
+ err = -EINVAL;
+ goto err_exec_fence;
+ }
+ }
+
/* Allocate extra slots for use by the command parser */
exec2_list = kvmalloc_array(count + 2, eb_element_size(),
__GFP_NOWARN | GFP_KERNEL);
if (exec2_list == NULL) {
drm_dbg(&i915->drm, "Failed to allocate exec list for %zd
buffers\n",
count);
- return -ENOMEM;
+ err = -ENOMEM;
+ goto err_alloc;
}
if (copy_from_user(exec2_list,
u64_to_user_ptr(args->buffers_ptr),
@@ -3435,7 +3444,8 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void
*data,
goto err_copy;
}
- err = i915_gem_do_execbuffer(dev, file, args, exec2_list);
+ err = i915_gem_do_execbuffer(dev, file, args, exec2_list, in_fence,
+ exec_fence);
/*
* Now that we have begun execution of the batchbuffer, we ignore
@@ -3476,12 +3486,13 @@ end:;
}
args->flags &= ~__I915_EXEC_UNKNOWN_FLAGS;
- kvfree(exec2_list);
-
- return err;
err_copy:
kvfree(exec2_list);
+err_alloc:
+ dma_fence_put(exec_fence);
+err_exec_fence:
+ dma_fence_put(in_fence);
return err;
}
--
2.28.0
