Commit b6a1a0e7 authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: determine is mst hdcp based on stream instead of sink signal 



[why]
It is possible even if sink signal is MST but driver enables SST stream.
We should not determine if we should do MST authentication based on
sink's capability.
Instead we should determine whether to do MST authentication based on
what we have enabled in stream.

Signed-off-by: default avatarWenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: default avatarAshley Thomas <Ashley.Thomas2@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent caa08c58

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) 
	link->dig_be = config->link_enc_inst;

	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;

	display->adjust.disable = 1;

	link->adjust.auth_delay = 2;

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+2 −0
Original line number Diff line number Diff line
@@ -2959,6 +2959,8 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off) 
		config.link_enc_inst = 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 ==

				SIGNAL_TYPE_DISPLAY_PORT_MST);

		cp_psp->funcs.update_stream_config(cp_psp->handle, &config);

	}

}

drivers/gpu/drm/amd/display/dc/dm_cp_psp.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct cp_psp_stream_config { 
	uint8_t otg_inst;

	uint8_t link_enc_inst;

	uint8_t stream_enc_inst;

	uint8_t mst_supported;

	void *dm_stream_ctx;

	bool dpms_off;

};

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

+1 −3
Original line number Diff line number Diff line
@@ -481,10 +481,8 @@ enum mod_hdcp_operation_mode mod_hdcp_signal_type_to_operation_mode( 
		break;

	case SIGNAL_TYPE_EDP:

	case SIGNAL_TYPE_DISPLAY_PORT:

		mode = MOD_HDCP_MODE_DP;

		break;

	case SIGNAL_TYPE_DISPLAY_PORT_MST:

		mode = MOD_HDCP_MODE_DP_MST;

		mode = MOD_HDCP_MODE_DP;

		break;

	default:

		break;

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

+3 −3
Original line number Diff line number Diff line
@@ -392,13 +392,13 @@ enum mod_hdcp_status mod_hdcp_write_content_type(struct mod_hdcp *hdcp); 
/* hdcp version helpers */

static inline uint8_t is_dp_hdcp(struct mod_hdcp *hdcp)

{

	return (hdcp->connection.link.mode == MOD_HDCP_MODE_DP ||

			hdcp->connection.link.mode == MOD_HDCP_MODE_DP_MST);

	return (hdcp->connection.link.mode == MOD_HDCP_MODE_DP);

}



static inline uint8_t is_dp_mst_hdcp(struct mod_hdcp *hdcp)

{

	return (hdcp->connection.link.mode == MOD_HDCP_MODE_DP_MST);

	return (hdcp->connection.link.mode == MOD_HDCP_MODE_DP &&

			hdcp->connection.link.dp.mst_supported);

}



static inline uint8_t is_hdmi_dvi_sl_hdcp(struct mod_hdcp *hdcp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE