]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/selftests: Fix build after dma-fence locking rework
authorMatthew Brost <matthew.brost@intel.com>
Mon, 23 Feb 2026 17:25:53 +0000 (09:25 -0800)
committerMatthew Brost <matthew.brost@intel.com>
Tue, 24 Feb 2026 17:34:48 +0000 (09:34 -0800)
The i915_active selftest no longer builds after the dma-fence locking
rework because it directly accessed the fence’s spinlock. The helper
dma_fence_spinlock() must now be used to obtain the spinlock. Update the
selftest to use dma_fence_spinlock() accordingly.

Fixes: 1f32f310a13c ("dma-buf: inline spinlock for fence protection v5")
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patch.msgid.link/20260223172553.1663749-1-matthew.brost@intel.com
drivers/gpu/drm/i915/selftests/i915_active.c

index 52345073b409abab363f8250798873f7eb898de2..9fea2fabeac4894d6559bbb4b625f893a9e3457a 100644 (file)
@@ -323,9 +323,9 @@ static void active_flush(struct i915_active *ref,
        if (!fence)
                return;
 
-       spin_lock_irq(fence->lock);
+       spin_lock_irq(dma_fence_spinlock(fence));
        __list_del_entry(&active->cb.node);
-       spin_unlock_irq(fence->lock); /* serialise with fence->cb_list */
+       spin_unlock_irq(dma_fence_spinlock(fence)); /* serialise with fence->cb_list */
        atomic_dec(&ref->count);
 
        GEM_BUG_ON(!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags));