From: Eric Bernstein Date: Tue, 3 Apr 2018 11:23:11 -0400 Subject: drm/amd/display: Move dp_pixel_encoding_type to stream_encoder include Git-commit: fcb2008a70c8dffc9179ce41838496ba816e14a1 Patch-mainline: v4.18-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 Signed-off-by: Eric Bernstein Reviewed-by: Nikola Cornij Acked-by: Harry Wentland Signed-off-by: Alex Deucher Acked-by: Petr Tesarik --- drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 17 --------------- drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 19 +++++++++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) --- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h @@ -186,23 +186,6 @@ enum controller_dp_test_pattern { CONTROLLER_DP_TEST_PATTERN_COLORSQUARES_CEA }; -enum dp_pixel_encoding_type { - DP_PIXEL_ENCODING_TYPE_RGB444 = 0x00000000, - DP_PIXEL_ENCODING_TYPE_YCBCR422 = 0x00000001, - DP_PIXEL_ENCODING_TYPE_YCBCR444 = 0x00000002, - DP_PIXEL_ENCODING_TYPE_RGB_WIDE_GAMUT = 0x00000003, - DP_PIXEL_ENCODING_TYPE_Y_ONLY = 0x00000004, - DP_PIXEL_ENCODING_TYPE_YCBCR420 = 0x00000005 -}; - -enum dp_component_depth { - DP_COMPONENT_PIXEL_DEPTH_6BPC = 0x00000000, - DP_COMPONENT_PIXEL_DEPTH_8BPC = 0x00000001, - DP_COMPONENT_PIXEL_DEPTH_10BPC = 0x00000002, - DP_COMPONENT_PIXEL_DEPTH_12BPC = 0x00000003, - DP_COMPONENT_PIXEL_DEPTH_16BPC = 0x00000004 -}; - enum dc_lut_mode { LUT_BYPASS, LUT_RAM_A, --- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h @@ -7,11 +7,29 @@ #define STREAM_ENCODER_H_ #include "audio_types.h" +#include "hw_shared.h" struct dc_bios; struct dc_context; struct dc_crtc_timing; +enum dp_pixel_encoding_type { + DP_PIXEL_ENCODING_TYPE_RGB444 = 0x00000000, + DP_PIXEL_ENCODING_TYPE_YCBCR422 = 0x00000001, + DP_PIXEL_ENCODING_TYPE_YCBCR444 = 0x00000002, + DP_PIXEL_ENCODING_TYPE_RGB_WIDE_GAMUT = 0x00000003, + DP_PIXEL_ENCODING_TYPE_Y_ONLY = 0x00000004, + DP_PIXEL_ENCODING_TYPE_YCBCR420 = 0x00000005 +}; + +enum dp_component_depth { + DP_COMPONENT_PIXEL_DEPTH_6BPC = 0x00000000, + DP_COMPONENT_PIXEL_DEPTH_8BPC = 0x00000001, + DP_COMPONENT_PIXEL_DEPTH_10BPC = 0x00000002, + DP_COMPONENT_PIXEL_DEPTH_12BPC = 0x00000003, + DP_COMPONENT_PIXEL_DEPTH_16BPC = 0x00000004 +}; + struct encoder_info_frame { /* auxiliary video information */ struct dc_info_packet avi; @@ -116,6 +134,7 @@ struct stream_encoder_funcs { void (*set_avmute)( struct stream_encoder *enc, bool enable); + }; #endif /* STREAM_ENCODER_H_ */