amdgpu_userq_signal_ioctl() calls drm_exec_init() without
DRM_EXEC_IGNORE_DUPLICATES. When the same GEM object appears more than
once across the read/write BO handle lists submitted by userspace,
drm_exec_lock_obj() returns -EALREADY the second time it locks that
object, which aborts the ioctl instead of treating the repeat as a
no-op.

Add DRM_EXEC_IGNORE_DUPLICATES so duplicate objects are silently
skipped on the second lock attempt, matching the intended semantics of
locking a set of (possibly overlapping) BOs before publishing a fence
on them.

Signed-off-by: Sunil Khatri <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
index 7ecb93796f15..017a81c0b228 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
@@ -562,7 +562,7 @@ int amdgpu_userq_signal_ioctl(struct drm_device *dev, void 
*data,
         * amdgpu_userq_ensure_ev_fence() can't be called while holding the resv
         * locks.
         */
-       drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT,
+       drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT | 
DRM_EXEC_IGNORE_DUPLICATES,
                      (num_read_bo_handles + num_write_bo_handles));
 
        drm_exec_until_all_locked(&exec) {
-- 
2.34.1

Reply via email to