Skip to content

Commit ec9e405

Browse files
jnikulagregkh
authored andcommitted
drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
commit ff646d0 upstream. Commit 8d9908e ("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: 8d9908e ("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> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Link: https://lore.kernel.org/r/20250805115656.832235-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit cbd3bae) Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 80eddbd commit ec9e405

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/gpu/drm/i915/display/intel_display_irq.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,10 +1492,14 @@ u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl)
14921492
if (!(master_ctl & GEN11_GU_MISC_IRQ))
14931493
return 0;
14941494

1495+
intel_display_rpm_assert_block(display);
1496+
14951497
iir = intel_de_read(display, GEN11_GU_MISC_IIR);
14961498
if (likely(iir))
14971499
intel_de_write(display, GEN11_GU_MISC_IIR, iir);
14981500

1501+
intel_display_rpm_assert_unblock(display);
1502+
14991503
return iir;
15001504
}
15011505

0 commit comments

Comments
 (0)