[PATCH 15/43] drm/amd/display: revert Exit idle optimizations before HDCP execution

[Wayne Lin]

From: Martin Leung <martin.le...@amd.com>

why and how:
causes black screen on PNP on DCN 3.5

This reverts commit 520b0596f978 ("drm/amd/display: Exit idle
optimizations before HDCP execution")

Cc: Mario Limonciello <mario.limoncie...@amd.com>
Cc: Alex Deucher <alexander.deuc...@amd.com>
Cc: sta...@vger.kernel.org
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
Acked-by: Wayne Lin <wayne....@amd.com>
Signed-off-by: Martin Leung <martin.le...@amd.com>
---
 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c    | 10 ----------
 drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h |  8 --------
 2 files changed, 18 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c 
b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
index 9a5a1726acaf..5e01c6e24cbc 100644
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
@@ -88,14 +88,6 @@ static uint8_t is_cp_desired_hdcp2(struct mod_hdcp *hdcp)
                        !hdcp->connection.is_hdcp2_revoked;
 }
 
-static void exit_idle_optimizations(struct mod_hdcp *hdcp)
-{
-       struct mod_hdcp_dm *dm = &hdcp->config.dm;
-
-       if (dm->funcs.exit_idle_optimizations)
-               dm->funcs.exit_idle_optimizations(dm->handle);
-}
-
 static enum mod_hdcp_status execution(struct mod_hdcp *hdcp,
                struct mod_hdcp_event_context *event_ctx,
                union mod_hdcp_transition_input *input)
@@ -551,8 +543,6 @@ enum mod_hdcp_status mod_hdcp_process_event(struct mod_hdcp 
*hdcp,
        memset(&event_ctx, 0, sizeof(struct mod_hdcp_event_context));
        event_ctx.event = event;
 
-       exit_idle_optimizations(hdcp);
-
        /* execute and transition */
        exec_status = execution(hdcp, &event_ctx, &hdcp->auth.trans_input);
        trans_status = transition(
diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h 
b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
index cdb17b093f2b..a4d344a4db9e 100644
--- a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
+++ b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
@@ -156,13 +156,6 @@ struct mod_hdcp_ddc {
        } funcs;
 };
 
-struct mod_hdcp_dm {
-       void *handle;
-       struct {
-               void (*exit_idle_optimizations)(void *handle);
-       } funcs;
-};
-
 struct mod_hdcp_psp {
        void *handle;
        void *funcs;
@@ -279,7 +272,6 @@ struct mod_hdcp_display_query {
 struct mod_hdcp_config {
        struct mod_hdcp_psp psp;
        struct mod_hdcp_ddc ddc;
-       struct mod_hdcp_dm dm;
        uint8_t index;
 };
 
-- 
2.37.3