From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org,
Jani Nikula <jani.nikula@intel.com>,
"Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH 1/4] drm/i915/display: Disable wakeref asserts around GU_MISC irq handling
Date: Tue, 8 Jul 2025 19:03:17 +0300 [thread overview]
Message-ID: <20250708160320.5653-1-ville.syrjala@linux.intel.com> (raw)
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
The GU_MISC/GSE interrupt may be raised even when we're not
holding a runtime PM wakeref. Disable the asserts while
processing GU_MISC irqs. Previously this was covered by
the use of raw_reg_{read,write}() which lack the assert.
Not having an assert is fine since we synchronize irqs
during runtime suspend.
Arguably this stuff shouldn't really be in the display code
since GU_MISC is for Gunit interrupts. But I suppose as long
as we only care about the GSE interrupt bit it doesn't really
matter that the code is misplaced.
Cc: Jani Nikula <jani.nikula@intel.com>
Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>
Closes: https://lore.kernel.org/intel-gfx/aG0tWkfmxWtxl_xc@zx2c4.com/
Fixes: 8d9908e8fe9c ("drm/i915/display: remove small micro-optimizations in irq handling")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display_irq.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index fb25ec8adae3..68157f177b6a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1506,10 +1506,14 @@ u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl)
if (!(master_ctl & GEN11_GU_MISC_IRQ))
return 0;
+ intel_display_rpm_assert_block(display);
+
iir = intel_de_read(display, GEN11_GU_MISC_IIR);
if (likely(iir))
intel_de_write(display, GEN11_GU_MISC_IIR, iir);
+ intel_display_rpm_assert_unblock(display);
+
return iir;
}
--
2.49.0
next reply other threads:[~2025-07-08 16:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-08 16:03 Ville Syrjala [this message]
2025-07-08 16:03 ` [PATCH 2/4] drm/i915/opregion: Extract intel_opregion_runtime_{suspend, resume}() Ville Syrjala
2025-10-08 6:40 ` Imre Deak
2025-07-08 16:03 ` [PATCH 3/4] drm/i915/opregion: Make intel_opregion_notify_adapter() static Ville Syrjala
2025-10-08 6:41 ` Imre Deak
2025-07-08 16:03 ` [PATCH 4/4] drm/i915/opregion: Flush asle_work during runtime suspend Ville Syrjala
2025-10-08 6:47 ` Imre Deak
2025-07-08 16:28 ` ✓ CI.KUnit: success for series starting with [1/4] drm/i915/display: Disable wakeref asserts around GU_MISC irq handling Patchwork
2025-07-08 16:43 ` ✗ CI.checksparse: warning " Patchwork
2025-07-08 17:06 ` ✓ Xe.CI.BAT: success " Patchwork
2025-07-08 18:54 ` ✓ Xe.CI.Full: " 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=20250708160320.5653-1-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=Jason@zx2c4.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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