summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/display/modules/inc
diff options
context:
space:
mode:
authorIsabel Zhang <isabel.zhang@amd.com>2020-02-27 11:19:13 -0500
committerAlex Deucher <alexander.deucher@amd.com>2020-03-19 00:03:04 -0400
commitb45f9a3ed41bdfac339c879732164e18c995c9a0 (patch)
tree9de01247252161efb66f2b2475b079bc8f505d31 /drivers/gpu/drm/amd/display/modules/inc
parentef65c702d40637ed9ee25edc8e8a994168a32377 (diff)
drm/amd/display: Remove redundant hdcp display state
[Why] Due to previous code changes displays which are in active state immediately transition to the active and added state. This makes the two states redundant and unnecessary. [How] Instead of updating the device state to active and added after successful addition, change state to inactive if addition failed. Also, change references to active and added state to just added state. Signed-off-by: Isabel Zhang <isabel.zhang@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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/modules/inc')
-rw-r--r--drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
index c088602bc1a0..eae9309cfb24 100644
--- a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
+++ b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
@@ -117,7 +117,6 @@ enum mod_hdcp_operation_mode {
enum mod_hdcp_display_state {
MOD_HDCP_DISPLAY_INACTIVE = 0,
MOD_HDCP_DISPLAY_ACTIVE,
- MOD_HDCP_DISPLAY_ACTIVE_AND_ADDED,
MOD_HDCP_DISPLAY_ENCRYPTION_ENABLED
};