Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access

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>
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 cbd3baeffbc08052ce7dc53f11bf5524b4411056)
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>

authored by

Jani Nikula and committed by
Tvrtko Ursulin
ff646d03 d7fa5754

+4
+4
drivers/gpu/drm/i915/display/intel_display_irq.c
··· 1506 1506 if (!(master_ctl & GEN11_GU_MISC_IRQ)) 1507 1507 return 0; 1508 1508 1509 + intel_display_rpm_assert_block(display); 1510 + 1509 1511 iir = intel_de_read(display, GEN11_GU_MISC_IIR); 1510 1512 if (likely(iir)) 1511 1513 intel_de_write(display, GEN11_GU_MISC_IIR, iir); 1514 + 1515 + intel_display_rpm_assert_unblock(display); 1512 1516 1513 1517 return iir; 1514 1518 }