Commit 49c4a8b6 authored by Joseph Gravenor's avatar Joseph Gravenor Committed by Alex Deucher
Browse files

drm/amd/display: fix typo 



[why]
MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION and
MOD_HDCP_STATUS_HDCP2_ENABLE_ENCRYPTION were supposed to be
MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE and
MOD_HDCP_STATUS_HDCP2_ENABLE_ENCRYPTION_FAILURE. Because of this
it always seems like mod_hdcp_hdcp1_enable_encryption
and mod_hdcp_hdcp2_enable_encryption are always passing

[how]
rename the elements to what they were supposed to be called

Signed-off-by: default avatarJoseph Gravenor <joseph.gravenor@amd.com>
Reviewed-by: default avatarWenjing Liu <Wenjing.Liu@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 501b4026

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

+4 −4
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ char *mod_hdcp_status_to_str(int32_t status) 
		return "MOD_HDCP_STATUS_HDCP1_VALIDATE_KSV_LIST_FAILURE";

	case MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED:

		return "MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED";

	case MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION:

		return "MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION";

	case MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE:

		return "MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE";

	case MOD_HDCP_STATUS_HDCP1_ENABLE_STREAM_ENCRYPTION_FAILURE:

		return "MOD_HDCP_STATUS_HDCP1_ENABLE_STREAM_ENCRYPTION_FAILURE";

	case MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE:
@@ -158,8 +158,8 @@ char *mod_hdcp_status_to_str(int32_t status) 
		return "MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_REVOKED";

	case MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_NOT_READY:

		return "MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_NOT_READY";

	case MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION:

		return "MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION";

	case MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE:

		return "MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE";

	case MOD_HDCP_STATUS_HDCP2_STREAM_READY_PENDING:

		return "MOD_HDCP_STATUS_HDCP2_STREAM_READY_PENDING";

	case MOD_HDCP_STATUS_HDCP2_VALIDATE_STREAM_READY_FAILURE:

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

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_enable_encryption(struct mod_hdcp *hdcp) 
	psp_hdcp_invoke(psp, hdcp_cmd->cmd_id);



	if (hdcp_cmd->hdcp_status != TA_HDCP_STATUS__SUCCESS) {

		status = MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION;

		status = MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE;

	} else if (!is_dp_mst_hdcp(hdcp)) {

		display->state = MOD_HDCP_DISPLAY_ENCRYPTION_ENABLED;

		HDCP_HDCP1_ENABLED_TRACE(hdcp, display->index);
@@ -832,7 +832,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_enable_dp_stream_encryption(struct mod_hdcp 
	if (hdcp_cmd->hdcp_status == TA_HDCP_STATUS__SUCCESS)

		status = MOD_HDCP_STATUS_SUCCESS;

	else

		status = MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION;

		status = MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE;



	mutex_unlock(&psp->hdcp_context.mutex);

	return status;

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ enum mod_hdcp_status { 
	MOD_HDCP_STATUS_HDCP1_KSV_LIST_NOT_READY,

	MOD_HDCP_STATUS_HDCP1_VALIDATE_KSV_LIST_FAILURE,

	MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED,

	MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION,

	MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE,

	MOD_HDCP_STATUS_HDCP1_ENABLE_STREAM_ENCRYPTION_FAILURE,

	MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE,

	MOD_HDCP_STATUS_HDCP1_MAX_DEVS_EXCEEDED_FAILURE,
@@ -90,7 +90,7 @@ enum mod_hdcp_status { 
	MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_NOT_READY,

	MOD_HDCP_STATUS_HDCP2_VALIDATE_RX_ID_LIST_FAILURE,

	MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_REVOKED,

	MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION,

	MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE,

	MOD_HDCP_STATUS_HDCP2_STREAM_READY_PENDING,

	MOD_HDCP_STATUS_HDCP2_VALIDATE_STREAM_READY_FAILURE,

	MOD_HDCP_STATUS_HDCP2_PREPARE_STREAM_MANAGEMENT_FAILURE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE