drm/xe: Fix duplicated put due to merge resolution

aa833fc3 · Thomas Hellström <[email protected]> · 2025-12-04 21:20:59 +01:00

An incorrect backmerge resolution resulted in an
incorrect duplicate put. Fix.

Reported-by: Linus Torvalds <[email protected]>
Closes: https://lore.kernel.org/dri-devel/CAHk-=whaiMayMx=LrL7P119MLBX6exM_mEu4S2uBRT+xWQ-mbA@mail.gmail.com/
Fixes: Fixes: ce0478b02ed2 ("Merge tag 'v6.18-rc6' into drm-next")
Signed-off-by: Thomas Hellström <[email protected]>
Acked-by: Dave Airlie <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: aa833fc394baad601b8f7779c1ae2ada3a06ce07
Parents: dd463c51

Changes

1 files changed · +0 −3

File	Status	Add	Del	Content
drivers/gpu/drm/xe/xe_exec_queue.c	modified	+0	−3	View file

drivers/gpu/drm/xe/xe_exec_queue.c

View file

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index 12adfc3..8724f8d 100644
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -394,9 +394,6 @@ void xe_exec_queue_destroy(struct kref *ref)
 	if (q->ufence_syncobj)
 		drm_syncobj_put(q->ufence_syncobj);
 
-	if (q->ufence_syncobj)
-		drm_syncobj_put(q->ufence_syncobj);
-
 	if (xe_exec_queue_uses_pxp(q))
 		xe_pxp_exec_queue_remove(gt_to_xe(q->gt)->pxp, q);
 