[PATCH 2/3] drm/i915/psr: Do not activate disabled PSR on irq_aux_error

[Jouni Högander]

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 <jouni.hogan...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c 
b/drivers/gpu/drm/i915/display/intel_psr.c
index 226d4d1c7c82..3930d28e3486 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -3209,8 +3209,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
-- 
2.43.0