From aa833fc394baad601b8f7779c1ae2ada3a06ce07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Hellstr=C3=B6m?= Date: Thu, 4 Dec 2025 21:20:59 +0100 Subject: [PATCH] drm/xe: Fix duplicated put due to merge resolution MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit An incorrect backmerge resolution resulted in an incorrect duplicate put. Fix. Reported-by: Linus Torvalds 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 Acked-by: Dave Airlie Signed-off-by: Linus Torvalds --- drivers/gpu/drm/xe/xe_exec_queue.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c index 12adfc3a0547..8724f8de67e2 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.c +++ b/drivers/gpu/drm/xe/xe_exec_queue.c @@ -391,9 +391,6 @@ void xe_exec_queue_destroy(struct kref *ref) xe_assert(gt_to_xe(q->gt), atomic_read(&q->job_cnt) == 0); - if (q->ufence_syncobj) - drm_syncobj_put(q->ufence_syncobj); - if (q->ufence_syncobj) drm_syncobj_put(q->ufence_syncobj); -- 2.47.3