From: Eric Bernstein <eric.bernstein@amd.com>
Date: Tue, 3 Apr 2018 15:23:11 +0000 (-0400)
Subject: drm/amd/display: Move dp_pixel_encoding_type to stream_encoder include
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fcb2008a70c8dffc9179ce41838496ba816e14a1;p=linux.git

drm/amd/display: Move dp_pixel_encoding_type to stream_encoder include

Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Nikola Cornij <Nikola.Cornij@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
index 9fe73028d5886..cf7433ebf91a0 100644
--- 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,
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
index 5c21336cae4cf..cfa7ec9517ae1 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
@@ -29,11 +29,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;
@@ -138,6 +156,7 @@ struct stream_encoder_funcs {
 
 	void (*set_avmute)(
 		struct stream_encoder *enc, bool enable);
+
 };
 
 #endif /* STREAM_ENCODER_H_ */