From: Jouni Högander Date: Fri, 15 Aug 2025 08:45:33 +0000 (+0300) Subject: drm/i915/psr: Do not activate disabled PSR on irq_aux_error X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73b60be7f62f1edfef7aac4783878932b2b59ad9;p=users%2Fhch%2Fmisc.git drm/i915/psr: Do not activate disabled PSR on irq_aux_error Currently intel_psr_work is continuing to activation of PSR which was just disabled when irq_aux_error == true. Fix this by skipping everything else than intel_psr_handle_irq in intel_psr_work when irq_aux_error == true. Signed-off-by: Jouni Högander Reviewed-by: Mika Kahola Link: https://lore.kernel.org/r/20250815084534.1637030-3-jouni.hogander@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 4a80f12563f8..86836aa61413 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -3211,8 +3211,10 @@ static void intel_psr_work(struct work_struct *work) if (!intel_dp->psr.enabled) goto unlock; - if (READ_ONCE(intel_dp->psr.irq_aux_error)) + if (READ_ONCE(intel_dp->psr.irq_aux_error)) { intel_psr_handle_irq(intel_dp); + goto unlock; + } /* * We have to make sure PSR is ready for re-enable