* [PATCH] drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
@ 2025-08-05 11:56 Jani Nikula
2025-08-14 7:04 ` Hogander, Jouni
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2025-08-05 11:56 UTC (permalink / raw)
To: intel-gfx, intel-xe
Cc: jani.nikula, Jason A . Donenfeld, stable, Ville Syrjälä
Commit 8d9908e8fe9c ("drm/i915/display: remove small micro-optimizations
in irq handling") not only removed the optimizations, it also enabled
wakeref asserts for the GEN11_GU_MISC_IIR access. Silence the asserts by
wrapping the access inside intel_display_rpm_assert_{block,unblock}().
Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>
Closes: https://lore.kernel.org/r/aG0tWkfmxWtxl_xc@zx2c4.com
Fixes: 8d9908e8fe9c ("drm/i915/display: remove small micro-optimizations in irq handling")
Cc: <stable@vger.kernel.org> # v6.13+
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@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.39.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
2025-08-05 11:56 [PATCH] drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access Jani Nikula
@ 2025-08-14 7:04 ` Hogander, Jouni
2025-08-14 10:08 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Hogander, Jouni @ 2025-08-14 7:04 UTC (permalink / raw)
To: intel-xe@lists.freedesktop.org, Nikula, Jani,
intel-gfx@lists.freedesktop.org
Cc: ville.syrjala@linux.intel.com, stable@vger.kernel.org,
Jason@zx2c4.com
On Tue, 2025-08-05 at 14:56 +0300, Jani Nikula wrote:
> Commit 8d9908e8fe9c ("drm/i915/display: remove small micro-
> optimizations
> in irq handling") not only removed the optimizations, it also enabled
> wakeref asserts for the GEN11_GU_MISC_IIR access. Silence the asserts
> by
> wrapping the access inside
> intel_display_rpm_assert_{block,unblock}().
>
> Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Closes: https://lore.kernel.org/r/aG0tWkfmxWtxl_xc@zx2c4.com
> Fixes: 8d9908e8fe9c ("drm/i915/display: remove small micro-
> optimizations in irq handling")
> Cc: <stable@vger.kernel.org> # v6.13+
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@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;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
2025-08-14 7:04 ` Hogander, Jouni
@ 2025-08-14 10:08 ` Jani Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2025-08-14 10:08 UTC (permalink / raw)
To: Hogander, Jouni, intel-xe@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org
Cc: ville.syrjala@linux.intel.com, stable@vger.kernel.org,
Jason@zx2c4.com
On Thu, 14 Aug 2025, "Hogander, Jouni" <jouni.hogander@intel.com> wrote:
> On Tue, 2025-08-05 at 14:56 +0300, Jani Nikula wrote:
>> Commit 8d9908e8fe9c ("drm/i915/display: remove small micro-
>> optimizations
>> in irq handling") not only removed the optimizations, it also enabled
>> wakeref asserts for the GEN11_GU_MISC_IIR access. Silence the asserts
>> by
>> wrapping the access inside
>> intel_display_rpm_assert_{block,unblock}().
>>
>> Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>
>> Closes: https://lore.kernel.org/r/aG0tWkfmxWtxl_xc@zx2c4.com
>> Fixes: 8d9908e8fe9c ("drm/i915/display: remove small micro-
>> optimizations in irq handling")
>> Cc: <stable@vger.kernel.org> # v6.13+
>> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Thanks, pushed to din.
BR,
Jani.
>
>> ---
>> 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;
>> }
>>
>
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-14 10:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-05 11:56 [PATCH] drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access Jani Nikula
2025-08-14 7:04 ` Hogander, Jouni
2025-08-14 10:08 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox