Skip to content

Commit aa833fc

Browse files
Thomas Hellströmtorvalds
authored andcommitted
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: ce0478b ("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>
1 parent dd463c5 commit aa833fc

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

drivers/gpu/drm/xe/xe_exec_queue.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,6 @@ void xe_exec_queue_destroy(struct kref *ref)
391391

392392
xe_assert(gt_to_xe(q->gt), atomic_read(&q->job_cnt) == 0);
393393

394-
if (q->ufence_syncobj)
395-
drm_syncobj_put(q->ufence_syncobj);
396-
397394
if (q->ufence_syncobj)
398395
drm_syncobj_put(q->ufence_syncobj);
399396

0 commit comments

Comments
 (0)