From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Dave Airlie" <airlied@redhat.com>,
"Linus Torvalds" <torvalds@linux-foundation.org>
Subject: [PATCH] drm/xe: Fix duplicated put due to merge resolution
Date: Thu, 4 Dec 2025 21:20:59 +0100 [thread overview]
Message-ID: <20251204202059.326605-1-thomas.hellstrom@linux.intel.com> (raw)
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
next reply other threads:[~2025-12-04 20:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-04 20:20 Thomas Hellström [this message]
2025-12-04 20:41 ` [PATCH] drm/xe: Fix duplicated put due to merge resolution Linus Torvalds
2025-12-04 20:44 ` Thomas Hellström
2025-12-04 20:48 ` David Airlie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251204202059.326605-1-thomas.hellstrom@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox