drm/amd/display: Remove unused display_content_support

This was never filled in and thus never truly used.

Checking the EDID for content_type support is not required for sending
the avi infoframe packet.

v2:
- rebase to amd-staging-drm-next

Reviewed-by: Melissa Wen <mwen@igalia.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Joshua Ashton <joshua@froggi.es>
Signed-off-by: Melissa Wen <mwen@igalia.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index d4224de131385bebaa49c128fef24fd4356cabed..e03bb0e32e1dd56d508d733c4f0c808451fb945c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -188,7 +188,6 @@ struct dc_stream_state {
        struct link_encoder *link_enc;
        struct dc_stream_debug_options debug;
        struct dc_panel_patch sink_patches;
-       union display_content_support content_support;
        struct dc_crtc_timing timing;
        struct dc_crtc_timing_adjust adjust;
        struct dc_info_packet vrr_infopacket;

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 4b44c18a61a09115685a43bf80c3b9cd011724f2..e531ad3acefc8b29cccbda607af4c3003b310853 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -163,18 +163,6 @@ struct dc_edid {
 
 #define AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS 20
 
-union display_content_support {
-       unsigned int raw;
-       struct {
-               unsigned int valid_content_type :1;
-               unsigned int game_content :1;
-               unsigned int cinema_content :1;
-               unsigned int photo_content :1;
-               unsigned int graphics_content :1;
-               unsigned int reserved :27;
-       } bits;
-};
-
 struct dc_panel_patch {
        unsigned int dppowerup_delay;
        unsigned int extra_t12_ms;
@@ -207,8 +195,6 @@ struct dc_edid_caps {
        uint32_t audio_latency;
        uint32_t video_latency;
 
-       union display_content_support content_support;
-
        uint8_t qs_bit;
        uint8_t qy_bit;