Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Joseph Gravenor <joseph.gravenor@amd.com>
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Joseph Gravenor and committed by
Alex Deucher
49c4a8b6 501b4026

+8 -8
+4 -4
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c
··· 98 98 return "MOD_HDCP_STATUS_HDCP1_VALIDATE_KSV_LIST_FAILURE"; 99 99 case MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED: 100 100 return "MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED"; 101 - case MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION: 102 - return "MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION"; 101 + case MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE: 102 + return "MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE"; 103 103 case MOD_HDCP_STATUS_HDCP1_ENABLE_STREAM_ENCRYPTION_FAILURE: 104 104 return "MOD_HDCP_STATUS_HDCP1_ENABLE_STREAM_ENCRYPTION_FAILURE"; 105 105 case MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE: ··· 158 158 return "MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_REVOKED"; 159 159 case MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_NOT_READY: 160 160 return "MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_NOT_READY"; 161 - case MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION: 162 - return "MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION"; 161 + case MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE: 162 + return "MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE"; 163 163 case MOD_HDCP_STATUS_HDCP2_STREAM_READY_PENDING: 164 164 return "MOD_HDCP_STATUS_HDCP2_STREAM_READY_PENDING"; 165 165 case MOD_HDCP_STATUS_HDCP2_VALIDATE_STREAM_READY_FAILURE:
+2 -2
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
··· 257 257 psp_hdcp_invoke(psp, hdcp_cmd->cmd_id); 258 258 259 259 if (hdcp_cmd->hdcp_status != TA_HDCP_STATUS__SUCCESS) { 260 - status = MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION; 260 + status = MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE; 261 261 } else if (!is_dp_mst_hdcp(hdcp)) { 262 262 display->state = MOD_HDCP_DISPLAY_ENCRYPTION_ENABLED; 263 263 HDCP_HDCP1_ENABLED_TRACE(hdcp, display->index); ··· 832 832 if (hdcp_cmd->hdcp_status == TA_HDCP_STATUS__SUCCESS) 833 833 status = MOD_HDCP_STATUS_SUCCESS; 834 834 else 835 - status = MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION; 835 + status = MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE; 836 836 837 837 mutex_unlock(&psp->hdcp_context.mutex); 838 838 return status;
+2 -2
drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
··· 60 60 MOD_HDCP_STATUS_HDCP1_KSV_LIST_NOT_READY, 61 61 MOD_HDCP_STATUS_HDCP1_VALIDATE_KSV_LIST_FAILURE, 62 62 MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED, 63 - MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION, 63 + MOD_HDCP_STATUS_HDCP1_ENABLE_ENCRYPTION_FAILURE, 64 64 MOD_HDCP_STATUS_HDCP1_ENABLE_STREAM_ENCRYPTION_FAILURE, 65 65 MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE, 66 66 MOD_HDCP_STATUS_HDCP1_MAX_DEVS_EXCEEDED_FAILURE, ··· 90 90 MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_NOT_READY, 91 91 MOD_HDCP_STATUS_HDCP2_VALIDATE_RX_ID_LIST_FAILURE, 92 92 MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_REVOKED, 93 - MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION, 93 + MOD_HDCP_STATUS_HDCP2_ENABLE_STREAM_ENCRYPTION_FAILURE, 94 94 MOD_HDCP_STATUS_HDCP2_STREAM_READY_PENDING, 95 95 MOD_HDCP_STATUS_HDCP2_VALIDATE_STREAM_READY_FAILURE, 96 96 MOD_HDCP_STATUS_HDCP2_PREPARE_STREAM_MANAGEMENT_FAILURE,