From: Tony Cheng <tony.cheng@amd.com>
Date: Sun, 23 Apr 2017 10:46:02 -0400
Subject: drm/amd/display: move tg_color to dc_hw_types
Git-commit: e91b57334a4ef9355ffa397d767e8c3a2c690f22
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h             |   12 ++++++------
 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h |   12 ------------
 2 files changed, 6 insertions(+), 18 deletions(-)

--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -641,12 +641,12 @@ struct dc_crtc_timing {
 	struct dc_crtc_timing_flags flags;
 };
 
-struct _dlg_otg_param {
-	int vstartup_start;
-	int vupdate_offset;
-	int vupdate_width;
-	int vready_offset;
-	enum signal_type signal;
+#define MAX_TG_COLOR_VALUE 0x3FF
+struct tg_color {
+	/* Maximum 10 bits color value */
+	uint16_t color_r_cr;
+	uint16_t color_g_y;
+	uint16_t color_b_cb;
 };
 
 #endif /* DC_HW_TYPES_H */
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
@@ -28,18 +28,6 @@
 
 struct dc_bios;
 
-/**
- *  These parameters are required as input when doing blanking/Unblanking
-*/
-#define MAX_TG_COLOR_VALUE 0x3FF
-
-struct tg_color {
-	/* Maximum 10 bits color value */
-	uint16_t color_r_cr;
-	uint16_t color_g_y;
-	uint16_t color_b_cb;
-};
-
 /* Contains CRTC vertical/horizontal pixel counters */
 struct crtc_position {
 	uint32_t vertical_count;