tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: ce0478b02ed2 ("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>

authored by

Thomas Hellström and committed by
Linus Torvalds aa833fc3 dd463c51

-3
-3
drivers/gpu/drm/xe/xe_exec_queue.c
··· 394 394 if (q->ufence_syncobj) 395 395 drm_syncobj_put(q->ufence_syncobj); 396 396 397 - if (q->ufence_syncobj) 398 - drm_syncobj_put(q->ufence_syncobj); 399 - 400 397 if (xe_exec_queue_uses_pxp(q)) 401 398 xe_pxp_exec_queue_remove(gt_to_xe(q->gt)->pxp, q); 402 399