mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/amd/display: correct some hdcp variable naming
[why] In HDCP update stream config interface, some variables are named as xxx_supported, but in fact the variable indicates whether or not xxx_enabled. Correct the naming so it is less confusing to read the code. Signed-off-by: Wenjing Liu <wenjing.liu@amd.com> Reviewed-by: George Shen <George.Shen@amd.com> Acked-by: Anson Jacob <Anson.Jacob@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
accff74e8f
commit
aac6d4391a
6 changed files with 19 additions and 17 deletions
|
@ -449,11 +449,12 @@ static void update_config(void *handle, struct cp_psp_stream_config *config)
|
|||
link->mode = mod_hdcp_signal_type_to_operation_mode(aconnector->dc_sink->sink_signal);
|
||||
|
||||
display->controller = CONTROLLER_ID_D0 + config->otg_inst;
|
||||
display->dig_fe = config->stream_enc_inst;
|
||||
link->dig_be = config->link_enc_inst;
|
||||
display->dig_fe = config->dig_fe;
|
||||
link->dig_be = config->dig_be;
|
||||
link->ddc_line = aconnector->dc_link->ddc_hw_inst + 1;
|
||||
link->dp.rev = aconnector->dc_link->dpcd_caps.dpcd_rev.raw;
|
||||
link->dp.mst_supported = config->mst_supported;
|
||||
link->dp.assr_enabled = config->assr_enabled;
|
||||
link->dp.mst_enabled = config->mst_enabled;
|
||||
display->adjust.disable = 1;
|
||||
link->adjust.auth_delay = 3;
|
||||
link->adjust.hdcp1.disable = 0;
|
||||
|
|
|
@ -3169,17 +3169,17 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off)
|
|||
{
|
||||
struct cp_psp *cp_psp = &pipe_ctx->stream->ctx->cp_psp;
|
||||
if (cp_psp && cp_psp->funcs.update_stream_config) {
|
||||
struct cp_psp_stream_config config;
|
||||
|
||||
memset(&config, 0, sizeof(config));
|
||||
struct cp_psp_stream_config config = {0};
|
||||
enum dp_panel_mode panel_mode =
|
||||
dp_get_panel_mode(pipe_ctx->stream->link);
|
||||
|
||||
config.otg_inst = (uint8_t) pipe_ctx->stream_res.tg->inst;
|
||||
/*stream_enc_inst*/
|
||||
config.stream_enc_inst = (uint8_t) pipe_ctx->stream_res.stream_enc->stream_enc_inst;
|
||||
config.link_enc_inst = pipe_ctx->stream->link->link_enc_hw_inst;
|
||||
config.dig_fe = (uint8_t) pipe_ctx->stream_res.stream_enc->stream_enc_inst;
|
||||
config.dig_be = pipe_ctx->stream->link->link_enc_hw_inst;
|
||||
config.dpms_off = dpms_off;
|
||||
config.dm_stream_ctx = pipe_ctx->stream->dm_stream_context;
|
||||
config.mst_supported = (pipe_ctx->stream->signal ==
|
||||
config.assr_enabled = (panel_mode == DP_PANEL_MODE_EDP);
|
||||
config.mst_enabled = (pipe_ctx->stream->signal ==
|
||||
SIGNAL_TYPE_DISPLAY_PORT_MST);
|
||||
cp_psp->funcs.update_stream_config(cp_psp->handle, &config);
|
||||
}
|
||||
|
|
|
@ -30,9 +30,10 @@ struct dc_link;
|
|||
|
||||
struct cp_psp_stream_config {
|
||||
uint8_t otg_inst;
|
||||
uint8_t link_enc_inst;
|
||||
uint8_t stream_enc_inst;
|
||||
uint8_t mst_supported;
|
||||
uint8_t dig_be;
|
||||
uint8_t dig_fe;
|
||||
uint8_t assr_enabled;
|
||||
uint8_t mst_enabled;
|
||||
void *dm_stream_ctx;
|
||||
bool dpms_off;
|
||||
};
|
||||
|
|
|
@ -397,7 +397,7 @@ static inline uint8_t is_dp_hdcp(struct mod_hdcp *hdcp)
|
|||
static inline uint8_t is_dp_mst_hdcp(struct mod_hdcp *hdcp)
|
||||
{
|
||||
return (hdcp->connection.link.mode == MOD_HDCP_MODE_DP &&
|
||||
hdcp->connection.link.dp.mst_supported);
|
||||
hdcp->connection.link.dp.mst_enabled);
|
||||
}
|
||||
|
||||
static inline uint8_t is_hdmi_dvi_sl_hdcp(struct mod_hdcp *hdcp)
|
||||
|
|
|
@ -106,7 +106,7 @@ enum mod_hdcp_status mod_hdcp_add_display_to_topology(struct mod_hdcp *hdcp,
|
|||
dtm_cmd->dtm_in_message.topology_update_v2.dig_be = link->dig_be;
|
||||
dtm_cmd->dtm_in_message.topology_update_v2.dig_fe = display->dig_fe;
|
||||
if (is_dp_hdcp(hdcp))
|
||||
dtm_cmd->dtm_in_message.topology_update_v2.is_assr = link->dp.assr_supported;
|
||||
dtm_cmd->dtm_in_message.topology_update_v2.is_assr = link->dp.assr_enabled;
|
||||
|
||||
dtm_cmd->dtm_in_message.topology_update_v2.dp_mst_vcid = display->vc_id;
|
||||
dtm_cmd->dtm_in_message.topology_update_v2.max_hdcp_supported_version =
|
||||
|
|
|
@ -101,8 +101,8 @@ enum mod_hdcp_status {
|
|||
|
||||
struct mod_hdcp_displayport {
|
||||
uint8_t rev;
|
||||
uint8_t assr_supported;
|
||||
uint8_t mst_supported;
|
||||
uint8_t assr_enabled;
|
||||
uint8_t mst_enabled;
|
||||
};
|
||||
|
||||
struct mod_hdcp_hdmi {
|
||||
|
|
Loading…
Reference in a new issue