Revert "msm_hdmi_modes.h: fix HDMI_VFRMT_4096x2160p24_16_9"

This reverts commit 4ae5974.
rpiersall · Feb 13, 2017 · 4b6a5e3 · 4b6a5e3
1 parent e215dd3
commit 4b6a5e3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/include/uapi/video/msm_hdmi_modes.h b/include/uapi/video/msm_hdmi_modes.h
@@ -130,8 +130,8 @@ struct msm_hdmi_mode_timing_info {
 #define HDMI_VFRMT_3840x2160p30_16_9	EVFRMT_OFF(1)
 #define HDMI_VFRMT_3840x2160p25_16_9	EVFRMT_OFF(2)
 #define HDMI_VFRMT_3840x2160p24_16_9	EVFRMT_OFF(3)
-#define HDMI_VFRMT_4096x2160p24_16_9	EVFRMT_OFF(4)
-#define HDMI_EVFRMT_END			HDMI_VFRMT_4096x2160p24_16_9
+#define HDMI_EVFRMT_4096x2160p24_16_9	EVFRMT_OFF(4)
+#define HDMI_EVFRMT_END			HDMI_EVFRMT_4096x2160p24_16_9
 
 #define WQXGA_OFF(x)			(HDMI_EVFRMT_END + x)
 
@@ -249,8 +249,8 @@ struct msm_hdmi_mode_timing_info {
 #define HDMI_VFRMT_3840x2160p24_16_9_TIMING				\
 	{HDMI_VFRMT_3840x2160p24_16_9, 3840, 1276, 88, 296, false,	\
 	 2160, 8, 10, 72, false, 297000, 24000, false, HDMI_RES_AR_16_9}
-#define HDMI_VFRMT_4096x2160p24_16_9_TIMING				\
-	{HDMI_VFRMT_4096x2160p24_16_9, 4096, 1020, 88, 296, false,	\
+#define HDMI_EVFRMT_4096x2160p24_16_9_TIMING				\
+	{HDMI_EVFRMT_4096x2160p24_16_9, 4096, 1020, 88, 296, false,	\
 	 2160, 8, 10, 72, false, 297000, 24000, false, HDMI_RES_AR_16_9}
 
 #define HDMI_VFRMT_800x600p60_4_3_TIMING				\
@@ -348,7 +348,7 @@ do {	\
 		MSM_HDMI_MODES_SET_TIMING(__lut,	\
 			HDMI_VFRMT_3840x2160p24_16_9);	\
 		MSM_HDMI_MODES_SET_TIMING(__lut,	\
-			HDMI_VFRMT_4096x2160p24_16_9);	\
+			HDMI_EVFRMT_4096x2160p24_16_9);	\
 	}	\
 	if (__type & MSM_HDMI_MODES_DVI) {	\
 		MSM_HDMI_MODES_SET_TIMING(__lut,	\
@@ -453,7 +453,7 @@ static inline const char *msm_hdmi_mode_2string(uint32_t mode)
 	case HDMI_VFRMT_3840x2160p30_16_9:	return "3840x2160 p30 16/9";
 	case HDMI_VFRMT_3840x2160p25_16_9:	return "3840x2160 p25 16/9";
 	case HDMI_VFRMT_3840x2160p24_16_9:	return "3840x2160 p24 16/9";
-	case HDMI_VFRMT_4096x2160p24_16_9:	return "4096x2160 p24 16/9";
+	case HDMI_EVFRMT_4096x2160p24_16_9:	return "4096x2160 p24 16/9";
 	case HDMI_VFRMT_1024x768p60_4_3:	return "1024x768 p60 4/3";
 	case HDMI_VFRMT_1280x1024p60_5_4:	return "1280x1024 p60 5/4";
 	case HDMI_VFRMT_2560x1600p60_16_9:	return "2560x1600 p60 16/9";