drm/xe: Fix duplicated put due to merge resolution

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

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Closes: https://lore.kernel.org/dri-devel/CAHk-=whaiMayMx=LrL7P119MLBX6exM_mEu4S2uBRT+xWQ-mbA@mail.gmail.com/
Fixes: Fixes: ce0478b02e ("Merge tag 'v6.18-rc6' into drm-next")
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Thomas Hellström 2025-12-04 21:20:59 +01:00 committed by Linus Torvalds
parent dd463c51a3
commit aa833fc394
1 changed files with 0 additions and 3 deletions

View File

@ -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); 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) if (q->ufence_syncobj)
drm_syncobj_put(q->ufence_syncobj); drm_syncobj_put(q->ufence_syncobj);