Commit aa833fc3 authored by Thomas Hellström's avatar Thomas Hellström Committed by Linus Torvalds
Browse files

drm/xe: Fix duplicated put due to merge resolution 



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

Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Closes: https://lore.kernel.org/dri-devel/CAHk-=whaiMayMx=LrL7P119MLBX6exM_mEu4S2uBRT+xWQ-mbA@mail.gmail.com/


Fixes: Fixes: ce0478b0 ("Merge tag 'v6.18-rc6' into drm-next")
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd463c51

drivers/gpu/drm/xe/xe_exec_queue.c

+0 −3
Original line number Diff line number Diff line
@@ -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);