Skip to content

Commit e49b216

Browse files
leungmartinroxanan1996
authored andcommitted
drm/amd/display: revert Exit idle optimizations before HDCP execution
BugLink: https://bugs.launchpad.net/bugs/2075154 commit f2703a3 upstream. why and how: causes black screen on PNP on DCN 3.5 This reverts commit f30a3be ("drm/amd/display: Exit idle optimizations before HDCP execution") Cc: Mario Limonciello <[email protected]> Cc: Alex Deucher <[email protected]> Reviewed-by: Nicholas Kazlauskas <[email protected]> Acked-by: Wayne Lin <[email protected]> Signed-off-by: Martin Leung <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 7ceebd0 commit e49b216

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,6 @@ static uint8_t is_cp_desired_hdcp2(struct mod_hdcp *hdcp)
8888
!hdcp->connection.is_hdcp2_revoked;
8989
}
9090

91-
static void exit_idle_optimizations(struct mod_hdcp *hdcp)
92-
{
93-
struct mod_hdcp_dm *dm = &hdcp->config.dm;
94-
95-
if (dm->funcs.exit_idle_optimizations)
96-
dm->funcs.exit_idle_optimizations(dm->handle);
97-
}
98-
9991
static enum mod_hdcp_status execution(struct mod_hdcp *hdcp,
10092
struct mod_hdcp_event_context *event_ctx,
10193
union mod_hdcp_transition_input *input)
@@ -551,8 +543,6 @@ enum mod_hdcp_status mod_hdcp_process_event(struct mod_hdcp *hdcp,
551543
memset(&event_ctx, 0, sizeof(struct mod_hdcp_event_context));
552544
event_ctx.event = event;
553545

554-
exit_idle_optimizations(hdcp);
555-
556546
/* execute and transition */
557547
exec_status = execution(hdcp, &event_ctx, &hdcp->auth.trans_input);
558548
trans_status = transition(

drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,6 @@ struct mod_hdcp_ddc {
156156
} funcs;
157157
};
158158

159-
struct mod_hdcp_dm {
160-
void *handle;
161-
struct {
162-
void (*exit_idle_optimizations)(void *handle);
163-
} funcs;
164-
};
165-
166159
struct mod_hdcp_psp {
167160
void *handle;
168161
void *funcs;
@@ -279,7 +272,6 @@ struct mod_hdcp_display_query {
279272
struct mod_hdcp_config {
280273
struct mod_hdcp_psp psp;
281274
struct mod_hdcp_ddc ddc;
282-
struct mod_hdcp_dm dm;
283275
uint8_t index;
284276
};
285277

0 commit comments

Comments
 (0)