[PATCH] drm/amd/display: remove mod_hdcp_hdcp2_get_link_encryption_status()

Kazlauskas, Nicholas nicholas.kazlauskas at amd.com
Wed Apr 1 19:59:03 UTC 2020


On 2020-04-01 3:56 p.m., Bhawanpreet Lakha wrote:
> It is not being used, so remove it
> 
> Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha at amd.com>

Thanks for the follow up!

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas at amd.com>

Regards,
Nicholas Kazlauskas

> ---
>   .../gpu/drm/amd/display/modules/hdcp/hdcp.h   |  2 --
>   .../drm/amd/display/modules/hdcp/hdcp_psp.c   | 29 -------------------
>   2 files changed, 31 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
> index 5cb4546be0ef..8e8a26dd46fc 100644
> --- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
> +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
> @@ -357,8 +357,6 @@ enum mod_hdcp_status mod_hdcp_hdcp2_prepare_stream_management(
>   		struct mod_hdcp *hdcp);
>   enum mod_hdcp_status mod_hdcp_hdcp2_validate_stream_ready(
>   		struct mod_hdcp *hdcp);
> -enum mod_hdcp_status mod_hdcp_hdcp2_get_link_encryption_status(struct mod_hdcp *hdcp,
> -							       enum mod_hdcp_encryption_status *encryption_status);
>   
>   /* ddc functions */
>   enum mod_hdcp_status mod_hdcp_read_bksv(struct mod_hdcp *hdcp);
> diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
> index aa147e171557..95a9c8bfbef6 100644
> --- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
> +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
> @@ -917,32 +917,3 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_stream_ready(struct mod_hdcp *hdcp)
>   	return status;
>   }
>   
> -enum mod_hdcp_status mod_hdcp_hdcp2_get_link_encryption_status(struct mod_hdcp *hdcp,
> -							       enum mod_hdcp_encryption_status *encryption_status)
> -{
> -	struct psp_context *psp = hdcp->config.psp.handle;
> -	struct ta_hdcp_shared_memory *hdcp_cmd;
> -
> -	hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
> -
> -	memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
> -
> -	hdcp_cmd->in_msg.hdcp2_get_encryption_status.session_handle = hdcp->auth.id;
> -	hdcp_cmd->out_msg.hdcp2_get_encryption_status.protection_level = 0;
> -	hdcp_cmd->cmd_id = TA_HDCP_COMMAND__HDCP2_GET_ENCRYPTION_STATUS;
> -	*encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF;
> -
> -	psp_hdcp_invoke(psp, hdcp_cmd->cmd_id);
> -
> -	if (hdcp_cmd->hdcp_status != TA_HDCP_STATUS__SUCCESS)
> -		return MOD_HDCP_STATUS_FAILURE;
> -
> -	if (hdcp_cmd->out_msg.hdcp2_get_encryption_status.protection_level == 1) {
> -		if (hdcp_cmd->out_msg.hdcp2_get_encryption_status.hdcp2_type == TA_HDCP2_CONTENT_TYPE__TYPE1)
> -			*encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP2_TYPE1_ON;
> -		else
> -			*encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP2_TYPE0_ON;
> -	}
> -
> -	return MOD_HDCP_STATUS_SUCCESS;
> -}
> 



More information about the amd-gfx mailing list