From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: [PATCH] drm/i915/overlay: Fix oops on unload
Date: Tue, 3 Mar 2026 12:14:17 +0200 [thread overview]
Message-ID: <20260303101417.14409-1-ville.syrjala@linux.intel.com> (raw)
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Apparently I failed to test the unload case properly and
thus didn't notice that the i915_overlay_is_active() needs
i915->overlay after fetch_and_zero() already cleared it.
Stop using fetch_and_zero() and only clear the pointer at
the end to avoid the oops.
Fixes: 38d9a352c45e ("drm/i915/overlay: Extract i915_overlay_is_active()")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
Looks like CI did catch this but the set of different mails that
CI sends these days is such a mess that the signal to noise ratio
is extremely low. So it just slipped past my radar.
drivers/gpu/drm/i915/i915_overlay.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_overlay.c b/drivers/gpu/drm/i915/i915_overlay.c
index 28518dbb5b8e..04d5ad6aba5a 100644
--- a/drivers/gpu/drm/i915/i915_overlay.c
+++ b/drivers/gpu/drm/i915/i915_overlay.c
@@ -482,9 +482,8 @@ static void __iomem *i915_overlay_setup(struct drm_device *drm,
static void i915_overlay_cleanup(struct drm_device *drm)
{
struct drm_i915_private *i915 = to_i915(drm);
- struct i915_overlay *overlay;
+ struct i915_overlay *overlay = i915->overlay;
- overlay = fetch_and_zero(&i915->overlay);
if (!overlay)
return;
@@ -499,6 +498,7 @@ static void i915_overlay_cleanup(struct drm_device *drm)
i915_active_fini(&overlay->last_flip);
kfree(overlay);
+ i915->overlay = NULL;
}
const struct intel_display_overlay_interface i915_display_overlay_interface = {
--
2.52.0
next reply other threads:[~2026-03-03 10:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-03 10:14 Ville Syrjala [this message]
2026-03-03 10:25 ` [PATCH] drm/i915/overlay: Fix oops on unload Michał Grzelak
2026-03-03 17:17 ` Ville Syrjälä
2026-03-03 11:01 ` ✓ CI.KUnit: success for " Patchwork
2026-03-03 11:51 ` ✓ Xe.CI.BAT: " Patchwork
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=20260303101417.14409-1-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.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