* [PATCH] drm/xe: Fix duplicated put due to merge resolution
@ 2025-12-04 20:20 Thomas Hellström
2025-12-04 20:41 ` Linus Torvalds
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Hellström @ 2025-12-04 20:20 UTC (permalink / raw)
To: intel-xe; +Cc: dri-devel, Thomas Hellström, Dave Airlie, Linus Torvalds
An incorrect backmerge resolution resulted in an
incorrect duplicate put. Fix.
Cc: Dave Airlie <airlied@redhat.com>
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>
---
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 02b75652d497..226d07a3d852 100644
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -392,9 +392,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);
base-commit: 29bce9c8b41d5c378263a927acb9a9074d0e7a0e
--
2.51.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/xe: Fix duplicated put due to merge resolution
2025-12-04 20:20 [PATCH] drm/xe: Fix duplicated put due to merge resolution Thomas Hellström
@ 2025-12-04 20:41 ` Linus Torvalds
2025-12-04 20:44 ` Thomas Hellström
0 siblings, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2025-12-04 20:41 UTC (permalink / raw)
To: Thomas Hellström; +Cc: intel-xe, dri-devel, Dave Airlie
On Thu, 4 Dec 2025 at 12:21, Thomas Hellström
<thomas.hellstrom@linux.intel.com> wrote:
>
> An incorrect backmerge resolution resulted in an
> incorrect duplicate put. Fix.
Ack. I can confirm that this seems to fix the issue for me. Thanks for
the quick response.
Should I just apply it directly?
Linus
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/xe: Fix duplicated put due to merge resolution
2025-12-04 20:41 ` Linus Torvalds
@ 2025-12-04 20:44 ` Thomas Hellström
2025-12-04 20:48 ` David Airlie
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Hellström @ 2025-12-04 20:44 UTC (permalink / raw)
To: Linus Torvalds; +Cc: intel-xe, dri-devel, Dave Airlie
Hi, Linus
On Thu, 2025-12-04 at 12:41 -0800, Linus Torvalds wrote:
> On Thu, 4 Dec 2025 at 12:21, Thomas Hellström
> <thomas.hellstrom@linux.intel.com> wrote:
> >
> > An incorrect backmerge resolution resulted in an
> > incorrect duplicate put. Fix.
>
> Ack. I can confirm that this seems to fix the issue for me. Thanks
> for
> the quick response.
>
> Should I just apply it directly?
>
> Linus
OK with me if ok with Dave.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/xe: Fix duplicated put due to merge resolution
2025-12-04 20:44 ` Thomas Hellström
@ 2025-12-04 20:48 ` David Airlie
0 siblings, 0 replies; 4+ messages in thread
From: David Airlie @ 2025-12-04 20:48 UTC (permalink / raw)
To: Thomas Hellström; +Cc: Linus Torvalds, intel-xe, dri-devel
On Fri, Dec 5, 2025 at 6:44 AM Thomas Hellström
<thomas.hellstrom@linux.intel.com> wrote:
>
> Hi, Linus
>
> On Thu, 2025-12-04 at 12:41 -0800, Linus Torvalds wrote:
> > On Thu, 4 Dec 2025 at 12:21, Thomas Hellström
> > <thomas.hellstrom@linux.intel.com> wrote:
> > >
> > > An incorrect backmerge resolution resulted in an
> > > incorrect duplicate put. Fix.
> >
> > Ack. I can confirm that this seems to fix the issue for me. Thanks
> > for
> > the quick response.
> >
> > Should I just apply it directly?
> >
> > Linus
>
> OK with me if ok with Dave.
Please do.
Acked-by: Dave Airlie <airlied@redhat.com>
>
> Thanks,
> Thomas
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-12-04 20:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-04 20:20 [PATCH] drm/xe: Fix duplicated put due to merge resolution Thomas Hellström
2025-12-04 20:41 ` Linus Torvalds
2025-12-04 20:44 ` Thomas Hellström
2025-12-04 20:48 ` David Airlie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).