[PATCH AUTOSEL 6.7 20/88] drm/amd/display: Fix Replay Desync Error IRQ handler

[Sasha Levin]

From: Dennis Chan <dennis.c...@amd.com>

[ Upstream commit dd5c6362ddcd8bdb07704faff8648593885ecfa1 ]

In previous case, Replay didn't identify the IRQ type, This commit fixes
the issues for the interrupt.

Tested-by: Daniel Wheeler <daniel.whee...@amd.com>
Reviewed-by: Robin Chen <robin.c...@amd.com>
Acked-by: Rodrigo Siqueira <rodrigo.sique...@amd.com>
Signed-off-by: Dennis Chan <dennis.c...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 .../display/dc/link/protocols/link_dp_irq_handler.c  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c 
b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c
index 0c00e94e90b1..9eadc2c7f221 100644
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c
@@ -190,9 +190,6 @@ static void handle_hpd_irq_replay_sink(struct dc_link *link)
        /*AMD Replay version reuse DP_PSR_ERROR_STATUS for REPLAY_ERROR 
status.*/
        union psr_error_status replay_error_status;
 
-       if (link->replay_settings.config.force_disable_desync_error_check)
-               return;
-
        if (!link->replay_settings.replay_feature_enabled)
                return;
 
@@ -210,9 +207,6 @@ static void handle_hpd_irq_replay_sink(struct dc_link *link)
                &replay_error_status.raw,
                sizeof(replay_error_status.raw));
 
-       if (replay_configuration.bits.DESYNC_ERROR_STATUS)
-               link->replay_settings.config.received_desync_error_hpd = 1;
-
        link->replay_settings.config.replay_error_status.bits.LINK_CRC_ERROR =
                replay_error_status.bits.LINK_CRC_ERROR;
        link->replay_settings.config.replay_error_status.bits.DESYNC_ERROR =
@@ -225,6 +219,12 @@ static void handle_hpd_irq_replay_sink(struct dc_link 
*link)
                
link->replay_settings.config.replay_error_status.bits.STATE_TRANSITION_ERROR) {
                bool allow_active;
 
+               if 
(link->replay_settings.config.replay_error_status.bits.DESYNC_ERROR)
+                       link->replay_settings.config.received_desync_error_hpd 
= 1;
+
+               if 
(link->replay_settings.config.force_disable_desync_error_check)
+                       return;
+
                /* Acknowledge and clear configuration bits */
                dm_helpers_dp_write_dpcd(
                        link->ctx,
-- 
2.43.0