summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dc_types.h
diff options
context:
space:
mode:
authorHarry Wentland <harry.wentland@amd.com>2023-02-13 11:19:31 -0500
committerAlex Deucher <alexander.deucher@amd.com>2023-03-07 14:22:39 -0500
commit1e88eb1b2c259994d034b0833cb489105a984ebb (patch)
treedddc6eca598aba6162af63b402670546ab15a444 /drivers/gpu/drm/amd/display/dc/dc_types.h
parentab487ea8910d2a84f851cb87f2cb49adcb5b774b (diff)
downloadlinux-stable-1e88eb1b2c259994d034b0833cb489105a984ebb.tar.gz
linux-stable-1e88eb1b2c259994d034b0833cb489105a984ebb.tar.bz2
linux-stable-1e88eb1b2c259994d034b0833cb489105a984ebb.zip
drm/amd/display: Drop CONFIG_DRM_AMD_DC_HDCP
[Why & How] There is no reason we still need a config option for this. Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com> Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com> Signed-off-by: Harry Wentland <harry.wentland@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dc_types.h')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dc_types.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index f28b8597cc1e..4b47fa00610b 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -40,9 +40,7 @@
#include "grph_object_defs.h"
#include "grph_object_ctrl_defs.h"
-#ifdef CONFIG_DRM_AMD_DC_HDCP
#include "dm_cp_psp.h"
-#endif
/* forward declarations */
struct dc_plane_state;
@@ -813,9 +811,7 @@ struct dc_context {
uint32_t dc_edp_id_count;
uint64_t fbc_gpu_addr;
struct dc_dmub_srv *dmub_srv;
-#ifdef CONFIG_DRM_AMD_DC_HDCP
struct cp_psp cp_psp;
-#endif
uint32_t *dcn_reg_offsets;
uint32_t *nbio_reg_offsets;
};
@@ -955,7 +951,6 @@ struct dc_link_status {
struct dpcd_caps *dpcd_caps;
};
-#if defined(CONFIG_DRM_AMD_DC_HDCP)
union hdcp_rx_caps {
struct {
uint8_t version;
@@ -982,7 +977,6 @@ struct hdcp_caps {
union hdcp_rx_caps rx_caps;
union hdcp_bcaps bcaps;
};
-#endif
/* DP MST stream allocation (payload bandwidth number) */
struct link_mst_stream_allocation {