Skip to content

Commit ff646d0

Browse files
jnikulatursulin
authored andcommitted
drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
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" <[email protected]> Closes: https://lore.kernel.org/r/[email protected] Fixes: 8d9908e ("drm/i915/display: remove small micro-optimizations in irq handling") Cc: [email protected] # v6.13+ Suggested-by: Ville Syrjälä <[email protected]> Reviewed-by: Jouni Högander <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jani Nikula <[email protected]> (cherry picked from commit cbd3bae) Signed-off-by: Tvrtko Ursulin <[email protected]>
1 parent d7fa575 commit ff646d0

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
@@ -1506,10 +1506,14 @@ u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl)
15061506
if (!(master_ctl & GEN11_GU_MISC_IRQ))
15071507
return 0;
15081508

1509+
intel_display_rpm_assert_block(display);
1510+
15091511
iir = intel_de_read(display, GEN11_GU_MISC_IIR);
15101512
if (likely(iir))
15111513
intel_de_write(display, GEN11_GU_MISC_IIR, iir);
15121514

1515+
intel_display_rpm_assert_unblock(display);
1516+
15131517
return iir;
15141518
}
15151519

0 commit comments

Comments
 (0)