Skip to content

Commit

Permalink
drm/amd/display: revert Exit idle optimizations before HDCP execution
Browse files Browse the repository at this point in the history
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 <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Martin Leung <martin.leung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Martin Leung authored and gregkh committed Jul 5, 2024
1 parent 5d7fef7 commit cc25508
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
10 changes: 0 additions & 10 deletions drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,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)
Expand Down Expand Up @@ -456,8 +448,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(
Expand Down
8 changes: 0 additions & 8 deletions drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,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;
Expand Down Expand Up @@ -259,7 +252,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;
};

Expand Down

0 comments on commit cc25508

Please sign in to comment.