diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xedid.h b/XilinxProcessorIPLib/drivers/video_common/src/xedid.h
index b857328c..0ae1daf5 100644
--- a/XilinxProcessorIPLib/drivers/video_common/src/xedid.h
+++ b/XilinxProcessorIPLib/drivers/video_common/src/xedid.h
@@ -57,7 +57,6 @@
 
 /******************************* Include Files ********************************/
 
-#include "xil_types.h"
 #include "xstatus.h"
 #include "xvid.h"
 
diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h
index accf2c3b..c40060f7 100644
--- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h
+++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h
@@ -54,7 +54,7 @@
 
 /******************************* Include Files ********************************/
 
-#include "xedid.h"
+#include "xil_types.h"
 
 /************************** Constant Definitions ******************************/
 
@@ -62,7 +62,7 @@
  * This typedef enumerates the list of available standard display monitor
  * timings as specified in the xvid_timings_table.c file. The naming format is:
  *
- * XVID_VM_<RESOLUTION>_<REFRESH RATE (HZ)>_<P|RB>
+ * XVID_VM_<RESOLUTION>_<REFRESH RATE (HZ)>_<P|I>(_RB)
  *
  * Where RB stands for reduced blanking.
  */
@@ -146,41 +146,38 @@ typedef enum {
 	XVID_VM_1920x1200_120_P_RB,
 	XVID_VM_1920x1440_120_P_RB,
 	XVID_VM_2560x1600_120_P_RB,
-	XVID_VM_1366x768_60_P,
-	XVID_VM_1920x1080_60_P,
-	XVID_VM_UHD_30_P,
-	XVID_VM_720_60_P,
-	XVID_VM_480_60_P,
-	XVID_VM_UHD2_60_P,
-	XVID_VM_UHD_60,
-	XVID_VM_NUM_SUPPORT_0,
-	XVID_VM_USE_EDID_PREFERRED,
-} XVid_VideoMode0;
 
-typedef enum {
-	XVID_VM_576I25 = 0,
-	XVID_VM_480I30,
-	XVID_VM_1080I25,
-	XVID_VM_1080I30,
-	XVID_VM_480P60,
-	XVID_VM_720P50,
-	XVID_VM_720P60,
-	XVID_VM_1080P24,
-	XVID_VM_1080P25,
-	XVID_VM_1080P30,
-	XVID_VM_1080P50,
-	XVID_VM_1080P60,
-	XVID_VM_4K2KP24,
-	XVID_VM_4K2KP25,
-	XVID_VM_4K2KP30,
-	XVID_VM_4K2KP60,
-	XVID_VM_WXGAP60,
-	XVID_VM_UXGAP60,
-	XVID_VM_WUXGAP60,
-	XVID_VM_WSXGAP60,
-	XVID_VM_NUM_SUPPORT_1,
+	XVID_VM_480_60_P,
+	XVID_VM_720_50_P,
+	XVID_VM_720_60_P,
+	XVID_VM_1366x768_60_P,
+	XVID_VM_1080_24_P,
+	XVID_VM_1080_25_P,
+	XVID_VM_1080_30_P,
+	XVID_VM_1080_50_P,
+	XVID_VM_1080_60_P,
+	XVID_VM_UHD2_60_P,
+	XVID_VM_UHD_30_P,
+	XVID_VM_UHD_60_P,
+	XVID_VM_4K2K_24_P,
+	XVID_VM_4K2K_25_P,
+	XVID_VM_4K2K_30_P,
+	XVID_VM_4K2K_60_P,
+
+	XVID_VM_WXGA_60_P,
+	XVID_VM_UXGA_60_P,
+	XVID_VM_WUXGA_60_P,
+	XVID_VM_WSXGA_60_P,
+
+	XVID_VM_480_30_I,
+	XVID_VM_576_25_I,
+	XVID_VM_1080_25_I,
+	XVID_VM_1080_30_I,
+
+	XVID_VM_NUM_SUPPORT,
+	XVID_VM_USE_EDID_PREFERRED,
 	XVID_VM_NO_INPUT
-} XVid_VideoMode1;
+} XVid_VideoMode;
 
 typedef enum {
 	XVID_FR_24HZ = 24,
@@ -189,13 +186,16 @@ typedef enum {
 	XVID_FR_50HZ = 50,
 	XVID_FR_56HZ = 56,
 	XVID_FR_60HZ = 60,
+	XVID_FR_65HZ = 65,
 	XVID_FR_67HZ = 67,
 	XVID_FR_70HZ = 70,
 	XVID_FR_72HZ = 72,
 	XVID_FR_75HZ = 75,
+	XVID_FR_85HZ = 85,
 	XVID_FR_87HZ = 87,
 	XVID_FR_88HZ = 88,
-	XV_NUM_SUPPORTED_RATE = 12
+	XVID_FR_120HZ = 120,
+	XV_NUM_SUPPORTED_RATE = 15
 } XVid_FrameRate;
 
 /****************************** Type Definitions ******************************/
@@ -223,48 +223,16 @@ typedef struct {
 } XVid_VideoTiming;
 
 typedef struct {
-	XVid_VideoMode1		VmId;
+	XVid_VideoMode		VmId;
 	char			*Name;
 	XVid_FrameRate		FrameRate;
+	u32			PixelClkKhz;
 	XVid_VideoTiming	Timing;
 } XVid_VideoTimingMode;
 
-/**
- * This typedef contains the display monitor timing attributes for a video mode.
- */
-typedef struct {
-	XVid_VideoMode0 VmId;		/**< Enumerated key. */
-	u8 DmtId;			/**< Standard Display Monitor Timing
-						(DMT) ID number. */
-	u16 HResolution;		/**< Horizontal resolution (in
-						pixels). */
-	u16 VResolution;		/**< Vertical resolution (in lines). */
-	u32 PixelClkKhz;		/**< Pixel frequency (in KHz). This is
-						also the M value for the video
-						stream (MVid). */
-	u8 Interlaced;			/**< Input stream interlaced scan
-						(0=non-interlaced/
-						1=interlaced). */
-	u8 HSyncPolarity;		/**< Horizontal synchronization polarity
-						(0=positive/1=negative). */
-	u8 VSyncPolarity;		/**< Vertical synchronization polarity
-						(0=positive/1=negative). */
-	u32 HFrontPorch;		/**< Horizontal front porch (in
-						pixels). */
-	u32 HSyncPulseWidth;		/**< Horizontal synchronization time
-						(pulse width in pixels). */
-	u32 HBackPorch;			/**< Horizontal back porch (in
-						pixels). */
-	u32 VFrontPorch;		/**< Vertical front porch (in lines). */
-	u32 VSyncPulseWidth;		/**< Vertical synchronization time
-						(pulse width in lines). */
-	u32 VBackPorch;			/**< Vertical back porch (in lines). */
-} XVid_DmtMode;
-
 /*************************** Variable Declarations ****************************/
 
-extern const XVid_DmtMode XVid_DmtModes[XVID_VM_NUM_SUPPORT_0];
-extern const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT_1];
+extern const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT];
 
 /**************************** Function Prototypes *****************************/
 
diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c
index 3a4176ce..2d4a3730 100644
--- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c
+++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c
@@ -58,8 +58,8 @@
  * resolutions. Each entry is of the format:
  * 1) XVID_VM_<HRES>x<VRES>_<REFRESH (HZ)>_P(_RB = Reduced Blanking)
  * 2) Display Monitor Timing (DMT) ID
- * 3) Horizontal resolution (pixels)
- * 4) Vertical resolution (lines)
+ * 3) Horizontal active resolution (pixels)
+ * 4) Vertical active resolution (lines)
  * 5) Pixel clock (KHz)
  * 6) Interlaced (0=non-interlaced|1=interlaced)
  * 7) Horizontal sync polarity (0=positive|1=negative)
@@ -71,120 +71,427 @@
  * 13) Vertical sync time (lines)
  * 14) Vertical back porch (lines)
  */
-const XVid_DmtMode XVid_DmtModes[XVID_VM_NUM_SUPPORT_0] =
+const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] =
 {
-	{XVID_VM_640x480_60_P,		0x04, 640,  480,  25175,  0, 1, 1, 8,   96,  40,  2,  2,  25},
-	{XVID_VM_800x600_60_P,		0x09, 800,  600,  40000,  0, 0, 0, 40,  128, 88,  1,  4,  23},
-	{XVID_VM_848x480_60_P,		0x0E, 848,  480,  33750,  0, 0, 0, 16,  112, 112, 6,  8,  23},
-	{XVID_VM_1024x768_60_P,		0x10, 1024, 768,  65000,  0, 1, 1, 24,  136, 160, 3,  6,  29},
-	{XVID_VM_1280x768_60_P_RB,	0x16, 1280, 768,  68250,  0, 0, 1, 48,  32,  80,  3,  7,  12},
-	{XVID_VM_1280x768_60_P,		0x17, 1280, 768,  79500,  0, 1, 0, 64,  128, 192, 3,  7,  20},
-	{XVID_VM_1280x800_60_P_RB,	0x1B, 1280, 800,  71000,  0, 0, 1, 48,  32,  80,  3,  6,  14},
-	{XVID_VM_1280x800_60_P,		0x1C, 1280, 800,  83500,  0, 1, 0, 72,  128, 200, 3,  6,  22},
-	{XVID_VM_1280x960_60_P,		0x20, 1280, 960,  108000, 0, 0, 0, 96,  112, 312, 1,  3,  36},
-	{XVID_VM_1280x1024_60_P,	0x23, 1280, 1024, 108000, 0, 0, 0, 48,  112, 248, 1,  3,  38},
-	{XVID_VM_1360x768_60_P,		0x27, 1360, 768,  85500,  0, 0, 0, 64,  112, 256, 3,  6,  18},
-	{XVID_VM_1400x1050_60_P_RB,	0x29, 1400, 1050, 101000, 0, 0, 1, 48,  32,  80,  3,  4,  23},
-	{XVID_VM_1400x1050_60_P,	0x2A, 1400, 1050, 121750, 0, 1, 0, 88,  144, 232, 3,  4,  32},
-	{XVID_VM_1440x900_60_P_RB,	0x2E, 1440, 900,  88750,  0, 0, 1, 48,  32,  80,  3,  6,  17},
-	{XVID_VM_1440x900_60_P,		0x2F, 1440, 900,  106500, 0, 1, 0, 80,  152, 232, 3,  6,  25},
-	{XVID_VM_1600x1200_60_P,	0x33, 1600, 1200, 162000, 0, 0, 0, 64,  192, 304, 1,  3,  46},
-	{XVID_VM_1680x1050_60_P_RB,	0x39, 1680, 1050, 119000, 0, 1, 0, 48,  32,  80,  3,  6,  21},
-	{XVID_VM_1680x1050_60_P,	0x3A, 1680, 1050, 146250, 0, 1, 0, 104, 176, 280, 3,  6,  30},
-	{XVID_VM_1792x1344_60_P,	0x3E, 1792, 1344, 204750, 0, 1, 0, 128, 200, 328, 1,  3,  46},
-	{XVID_VM_1856x1392_60_P,	0x41, 1856, 1392, 218250, 0, 1, 0, 96,  224, 352, 1,  3,  43},
-	{XVID_VM_1920x1200_60_P_RB,	0x44, 1920, 1200, 154000, 0, 0, 1, 48,  32,  80,  3,  6,  26},
-	{XVID_VM_1920x1200_60_P,	0x45, 1920, 1200, 193250, 0, 1, 0, 136, 200, 336, 3,  6,  36},
-	{XVID_VM_1920x1440_60_P,	0x49, 1920, 1440, 234000, 0, 1, 0, 128, 208, 344, 1,  3,  56},
-	{XVID_VM_2560x1600_60_P_RB,	0x4C, 2560, 1600, 268500, 0, 0, 1, 48,  32,  80,  3,  6,  37},
-	{XVID_VM_2560x1600_60_P,	0x4D, 2560, 1600, 348500, 0, 1, 0, 192, 280, 472, 3,  6,  49},
-	{XVID_VM_800x600_56_P,		0x08, 800,  600,  36000,  0, 0, 0, 24,  72,  128, 1,  2,  22},
-	{XVID_VM_1600x1200_65_P,	0x34, 1600, 1200, 175500, 0, 0, 0, 64,  192, 304, 1,  3,  46},
-	{XVID_VM_1600x1200_70_P,	0x35, 1600, 1200, 189000, 0, 0, 0, 64,  192, 304, 1,  3,  46},
-	{XVID_VM_1024x768_70_P,		0x11, 1024, 768,  75000,  0, 1, 1, 24,  136, 144, 3,  6,  29},
-	{XVID_VM_640x480_72_P,		0x05, 640,  480,  31500,  0, 1, 1, 16,  40,  120, 1,  3,  20},
-	{XVID_VM_800x600_72_P,		0x0A, 800,  600,  50000,  0, 0, 0, 56,  120, 64,  37, 6,  23},
-	{XVID_VM_640x480_75_P,		0x06, 640,  480,  31500,  0, 1, 1, 16,  64,  120, 1,  3,  16},
-	{XVID_VM_800x600_75_P,		0x0B, 800,  600,  49500,  0, 0, 0, 16,  80,  160, 1,  3,  21},
-	{XVID_VM_1024x768_75_P,		0x12, 1024, 768,  78750,  0, 0, 0, 16,  96,  176, 1,  3,  28},
-	{XVID_VM_1152x864_75_P,		0x15, 1152, 864,  108000, 0, 0, 0, 64,  128, 256, 1,  3,  32},
-	{XVID_VM_1280x768_75_P,		0x18, 1280, 768,  102250, 0, 1, 0, 80,  128, 208, 3,  7,  27},
-	{XVID_VM_1280x800_75_P,		0x1D, 1280, 800,  106500, 0, 1, 0, 80,  128, 208, 3,  6,  29},
-	{XVID_VM_1280x1024_75_P,	0x24, 1280, 1024, 135000, 0, 0, 0, 16,  144, 248, 1,  3,  38},
-	{XVID_VM_1400x1050_75_P,	0x2B, 1400, 1050, 156000, 0, 1, 0, 104, 144, 248, 3,  4,  42},
-	{XVID_VM_1440x900_75_P,		0x30, 1440, 900,  136750, 0, 1, 0, 96,  152, 31,  3,  6,  33},
-	{XVID_VM_1600x1200_75_P,	0x36, 1600, 1200, 202500, 0, 0, 0, 64,  192, 304, 1,  3,  46},
-	{XVID_VM_1680x1050_75_P,	0x3B, 1680, 1050, 187000, 0, 1, 0, 120, 176, 37,  3,  6,  40},
-	{XVID_VM_1792x1344_75_P,	0x3F, 1792, 1344, 261000, 0, 1, 0, 96,  216, 352, 1,  3,  69},
-	{XVID_VM_1856x1392_75_P,	0x42, 1856, 1392, 288000, 0, 1, 0, 128, 224, 352, 1,  3,  104},
-	{XVID_VM_1920x1200_75_P,	0x46, 1920, 1200, 245250, 0, 1, 0, 136, 208, 344, 3,  6,  46},
-	{XVID_VM_1920x1440_75_P,	0x4A, 1920, 1440, 297000, 0, 1, 0, 144, 224, 352, 1,  3,  56},
-	{XVID_VM_2560x1600_75_P,	0x4E, 2560, 1600, 443250, 0, 1, 0, 208, 280, 488, 3,  6,  63},
-	{XVID_VM_640x350_85_P,		0x01, 640,  350,  31500,  0, 0, 1, 32,  64,  96,  32, 3,  60},
-	{XVID_VM_640x400_85_P,		0x02, 640,  400,  31500,  0, 1, 0, 32,  64,  96,  1,  3,  41},
-	{XVID_VM_720x400_85_P,		0x03, 720,  400,  35500,  0, 1, 0, 36,  72,  108, 1,  3,  42},
-	{XVID_VM_640x480_85_P,		0x07, 640,  480,  36000,  0, 1, 1, 56,  56,  80,  1,  3,  25},
-	{XVID_VM_800x600_85_P,		0x0C, 800,  600,  56250,  0, 0, 0, 32,  64,  152, 1,  3,  27},
-	{XVID_VM_1024x768_85_P,		0x13, 1024, 768,  94500,  0, 0, 0, 48,  96,  208, 1,  3,  36},
-	{XVID_VM_1280x768_85_P,		0x19, 1280, 768,  117500, 0, 1, 0, 80,  136, 216, 3,  7,  31},
-	{XVID_VM_1280x800_85_P,		0x1E, 1280, 800,  122500, 0, 1, 0, 80,  136, 216, 3,  6,  34},
-	{XVID_VM_1280x960_85_P,		0x21, 1280, 960,  148500, 0, 0, 0, 64,  160, 224, 1,  3,  47},
-	{XVID_VM_1280x1024_85_P,	0x25, 1280, 1024, 157500, 0, 0, 0, 64,  160, 224, 1,  3,  44},
-	{XVID_VM_1400x1050_85_P,	0x2C, 1400, 1050, 179500, 0, 1, 0, 104, 152, 256, 3,  4,  48},
-	{XVID_VM_1440x900_85_P,		0x31, 1440, 900,  157000, 0, 1, 0, 104, 152, 32,  3,  6,  39},
-	{XVID_VM_1600x1200_85_P,	0x37, 1600, 1200, 229500, 0, 0, 0, 64,  192, 304, 1,  3,  46},
-	{XVID_VM_1680x1050_85_P,	0x3C, 1680, 1050, 214750, 0, 1, 0, 128, 176, 304, 3,  6,  46},
-	{XVID_VM_1920x1200_85_P,	0x47, 1920, 1200, 281250, 0, 1, 0, 144, 208, 352, 3,  6,  53},
-	{XVID_VM_2560x1600_85_P,	0x4F, 2560, 1600, 505250, 0, 1, 0, 208, 280, 488, 3,  6,  73},
-	{XVID_VM_800x600_120_P_RB,	0x0D, 800,  600,  73250,  0, 0, 1, 48,  32,  80,  3,  4,  29},
-	{XVID_VM_1024x768_120_P_RB,	0x14, 1024, 768,  115500, 0, 0, 1, 48,  32,  80,  3,  4,  38},
-	{XVID_VM_1280x768_120_P_RB,	0x1A, 1280, 768,  140250, 0, 0, 1, 48,  32,  80,  3,  7,  35},
-	{XVID_VM_1280x800_120_P_RB,	0x1F, 1280, 800,  146250, 0, 0, 1, 48,  32,  80,  3,  6,  38},
-	{XVID_VM_1280x960_120_P_RB,	0x22, 1280, 960,  175500, 0, 0, 1, 48,  32,  80,  3,  4,  50},
-	{XVID_VM_1280x1024_120_P_RB,	0x26, 1280, 1024, 187250, 0, 0, 1, 48,  32,  80,  3,  7,  50},
-	{XVID_VM_1360x768_120_P_RB,	0x28, 1360, 768,  148250, 0, 0, 1, 48,  32,  80,  3,  5,  37},
-	{XVID_VM_1400x1050_120_P_RB,	0x2D, 1400, 1050, 208000, 0, 0, 1, 48,  32,  80,  3,  4,  55},
-	{XVID_VM_1440x900_120_P_RB,	0x32, 1440, 900,  182750, 0, 0, 1, 48,  32,  80,  3,  6,  44},
-	{XVID_VM_1600x1200_120_P_RB,	0x38, 1600, 1200, 268250, 0, 0, 1, 48,  32,  80,  3,  4,  64},
-	{XVID_VM_1680x1050_120_P_RB,	0x3D, 1680, 1050, 245500, 0, 0, 1, 48,  32,  80,  3,  6,  53},
-	{XVID_VM_1792x1344_120_P_RB,	0x40, 1792, 1344, 333250, 0, 0, 1, 48,  32,  80,  3,  4,  72},
-	{XVID_VM_1856x1392_120_P_RB,	0x43, 1856, 1392, 356500, 0, 0, 1, 48,  32,  80,  3,  4,  75},
-	{XVID_VM_1920x1200_120_P_RB,	0x48, 1920, 1200, 317000, 0, 0, 1, 48,  32,  80,  3,  6,  62},
-	{XVID_VM_1920x1440_120_P_RB,	0x4B, 1920, 1440, 380500, 0, 0, 1, 48,  32,  80,  3,  4,  78},
-	{XVID_VM_2560x1600_120_P_RB,	0x50, 2560, 1600, 552750, 0, 0, 1, 48,  32,  80,  3,  6,  85},
-	{XVID_VM_1366x768_60_P,		0x00, 1366, 768,  72000,  0, 0, 0, 14,  56,  64,  1,  3,  28},
-	{XVID_VM_1920x1080_60_P,	0x00, 1920, 1080, 148500, 0, 1, 1, 88,  44,  148, 4,  5,  36},
-	{XVID_VM_UHD_30_P,		0x00, 3840, 2160, 297000, 0, 0, 1, 176, 88,  296, 20, 10, 60},
-	{XVID_VM_720_60_P,		0x00, 1280, 720,  74250,  0, 1, 1, 110, 40,  220, 5,  5,  20},
-	{XVID_VM_480_60_P,		0x00, 720,  480,  27027,  0, 1, 1, 16,  62,  60,  9,  6,  30},
-	{XVID_VM_UHD2_60_P,		0x00, 1920, 2160, 297000, 0, 0, 1, 88,  44,  148, 20, 10, 60},
-	{XVID_VM_UHD_60,		0x00, 3840, 2160, 594000, 0, 0, 1, 176, 88,  296, 20, 10, 60}
-};
+	/* Progressive modes - display mode timings (DMT). */
+	{ XVID_VM_640x480_60_P, "640x480@60Hz", XVID_FR_60HZ,
+		0x04, 25175,
+		{640, 8, 96, 40, 784, 1,
+		480, 2, 2, 25, 509, 0, 0, 0, 0, 1} },
+	{ XVID_VM_800x600_60_P, "800x600@60Hz", XVID_FR_60HZ,
+		0x09, 40000,
+		{800, 40, 128, 88, 1056, 0,
+		600, 1, 4, 23, 628, 0, 0, 0, 0, 0} },
+	{ XVID_VM_848x480_60_P, "848x480@60Hz", XVID_FR_60HZ,
+		0x0E, 33750,
+		{848, 16, 112, 112, 1088, 0,
+		480, 6, 8, 23, 517, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1024x768_60_P, "1024x768@60Hz", XVID_FR_60HZ,
+		0x10, 65000,
+		{1024, 24, 136, 160, 1344, 1,
+		768, 3, 6, 29, 806, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x768_60_P_RB, "1280x768@60Hz (RB)", XVID_FR_60HZ,
+		0x16, 68250,
+		{1280, 48, 32, 80, 1440, 0,
+		768, 3, 7, 12, 790, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x768_60_P, "1280x768@60Hz", XVID_FR_60HZ,
+		0x17, 79500,
+		{1280, 64, 128, 192, 1664, 1,
+		768, 3, 7, 20, 798, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x800_60_P_RB, "1280x800@60Hz (RB)", XVID_FR_60HZ,
+		0x1B, 71000,
+		{1280, 48, 32, 80, 1440, 0,
+		800, 3, 6, 14, 823, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x800_60_P, "1280x800@60Hz", XVID_FR_60HZ,
+		0x1C, 83500,
+		{1280, 72, 128, 200, 1680, 1,
+		800, 3, 6, 22, 831, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x960_60_P, "1280x960@60Hz", XVID_FR_60HZ,
+		0x20, 108000,
+		{1280, 96, 112, 312, 1800, 0,
+		960, 1, 3, 36, 1000, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x1024_60_P, "1280x1024@60Hz", XVID_FR_60HZ,
+		0x23, 108000,
+		{1280, 48, 112, 248, 1688, 0,
+		1024, 1, 3, 38, 1066, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1360x768_60_P, "1360x768@60Hz", XVID_FR_60HZ,
+		0x27, 85500,
+		{1360, 64, 112, 256, 1792, 0,
+		768, 3, 6, 18, 795, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1400x1050_60_P_RB, "1400x1050@60Hz (RB)", XVID_FR_60HZ,
+		0x29, 101000,
+		{1400, 48, 32, 80, 1560, 0,
+		1050, 3, 4, 23, 1080, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1400x1050_60_P, "1400x1050@60Hz", XVID_FR_60HZ,
+		0x2A, 121750,
+		{1400, 88, 144, 232, 1864, 1,
+		1050, 3, 4, 32, 1089, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1440x900_60_P_RB, "1440x900@60Hz (RB)", XVID_FR_60HZ,
+		0x2E, 88750,
+		{1440, 48, 32, 80, 1600, 0,
+		900, 3, 6, 17, 926, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1440x900_60_P, "1440x900@60Hz", XVID_FR_60HZ,
+		0x2F, 106500,
+		{1440, 80, 152, 232, 1904, 1,
+		900, 3, 6, 25, 934, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1600x1200_60_P, "1600x1200@60Hz", XVID_FR_60HZ,
+		0x33, 162000,
+		{1600, 64, 192, 304, 2160, 0,
+		1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1680x1050_60_P_RB, "1680x1050@60Hz (RB)", XVID_FR_60HZ,
+		0x39, 119000,
+		{1680, 48, 32, 80, 1840, 1,
+		1050, 3, 6, 21, 1080, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1680x1050_60_P, "1680x1050@60Hz", XVID_FR_60HZ,
+		0x3A, 146250,
+		{1680, 104, 176, 280, 2240, 1,
+		1050, 3, 6, 30, 1089, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1792x1344_60_P, "1792x1344@60Hz", XVID_FR_60HZ,
+		0x3E, 204750,
+		{1792, 128, 200, 328, 2448, 1,
+		1344, 1, 3, 46, 1394, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1856x1392_60_P, "1856x1392@60Hz", XVID_FR_60HZ,
+		0x41, 218250,
+		{1856, 96, 224, 352, 2528, 1,
+		1392, 1, 3, 43, 1439, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1920x1200_60_P_RB, "1920x1200@60Hz (RB)", XVID_FR_60HZ,
+		0x44, 154000,
+		{1920, 48, 32, 80, 2080, 0,
+		1200, 3, 6, 26, 1235, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1920x1200_60_P, "1920x1200@60Hz", XVID_FR_60HZ,
+		0x45, 193250,
+		{1920, 136, 200, 336, 2592, 1,
+		1200, 3, 6, 36, 1245, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1920x1440_60_P, "1920x1440@60Hz", XVID_FR_60HZ,
+		0x49, 234000,
+		{1920, 128, 208, 344, 2600, 1,
+		1440, 1, 3, 56, 1500, 0, 0, 0, 0, 0} },
+	{ XVID_VM_2560x1600_60_P_RB, "2560x1600@60Hz (RB)", XVID_FR_60HZ,
+		0x4C, 268500,
+		{2560, 48, 32, 80, 2720, 0,
+		1600, 3, 6, 37, 1646, 0, 0, 0, 0, 1} },
+	{ XVID_VM_2560x1600_60_P, "2560x1600@60Hz", XVID_FR_60HZ,
+		0x4D, 348500,
+		{2560, 192, 280, 472, 3504, 1,
+		1600, 3, 6, 49, 1658, 0, 0, 0, 0, 0} },
+	{ XVID_VM_800x600_56_P, "800x600@56Hz", XVID_FR_56HZ,
+		0x08, 36000,
+		{800, 24, 72, 128, 1024, 0,
+		600, 1, 2, 22, 625, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1600x1200_65_P, "1600x1200@65Hz", XVID_FR_65HZ,
+		0x34, 175500,
+		{1600, 64, 192, 304, 2160, 0,
+		1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1600x1200_70_P, "1600x1200@70Hz", XVID_FR_70HZ,
+		0x35, 189000,
+		{1600, 64, 192, 304, 2160, 0,
+		1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1024x768_70_P, "1024x768@70Hz", XVID_FR_70HZ,
+		0x11, 75000,
+		{1024, 24, 136, 144, 1328, 1,
+		768, 3, 6, 29, 806, 0, 0, 0, 0, 1} },
+	{ XVID_VM_640x480_72_P, "640x480@72Hz", XVID_FR_72HZ,
+		0x05, 31500,
+		{640, 16, 40, 120, 816, 1,
+		480, 1, 3, 20, 504, 0, 0, 0, 0, 1} },
+	{ XVID_VM_800x600_72_P, "800x600@72Hz", XVID_FR_72HZ,
+		0x0A, 50000,
+		{800, 56, 120, 64, 1040, 0,
+		600, 37, 6, 23, 666, 0, 0, 0, 0, 0} },
+	{ XVID_VM_640x480_75_P, "640x480@75Hz", XVID_FR_75HZ,
+		0x06, 31500,
+		{640, 16, 64, 120, 840, 1,
+		480, 1, 3, 16, 500, 0, 0, 0, 0, 1} },
+	{ XVID_VM_800x600_75_P, "800x600@75Hz", XVID_FR_75HZ,
+		0x0B, 49500,
+		{800, 16, 80, 160, 1056, 0,
+		600, 1, 3, 21, 625, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1024x768_75_P, "1024x768@75Hz", XVID_FR_75HZ,
+		0x12, 78750,
+		{1024, 16, 96, 176, 1312, 0,
+		768, 1, 3, 28, 800, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1152x864_75_P, "1152x864@75Hz", XVID_FR_75HZ,
+		0x15, 108000,
+		{1152, 64, 128, 256, 1600, 0,
+		864, 1, 3, 32, 900, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x768_75_P, "1280x768@75Hz", XVID_FR_75HZ,
+		0x18, 102250,
+		{1280, 80, 128, 208, 1696, 1,
+		768, 3, 7, 27, 805, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x800_75_P, "1280x800@75Hz", XVID_FR_75HZ,
+		0x1D, 106500,
+		{1280, 80, 128, 208, 1696, 1,
+		800, 3, 6, 29, 838, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x1024_75_P, "1280x1024@75Hz", XVID_FR_75HZ,
+		0x24, 135000,
+		{1280, 16, 144, 248, 1688, 0,
+		1024, 1, 3, 38, 1066, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1400x1050_75_P, "1400x1050@75Hz", XVID_FR_75HZ,
+		0x2B, 156000,
+		{1400, 104, 144, 248, 1896, 1,
+		1050, 3, 4, 42, 1099, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1440x900_75_P, "1440x900@75Hz", XVID_FR_75HZ,
+		0x30, 136750,
+		{1440, 96, 152, 31, 1719, 1,
+		900, 3, 6, 33, 942, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1600x1200_75_P, "1600x1200@75Hz", XVID_FR_75HZ,
+		0x36, 202500,
+		{1600, 64, 192, 304, 2160, 0,
+		1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1680x1050_75_P, "1680x1050@75Hz", XVID_FR_75HZ,
+		0x3B, 187000,
+		{1680, 120, 176, 37, 2013, 1,
+		1050, 3, 6, 40, 1099, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1792x1344_75_P, "1792x1344@75Hz", XVID_FR_75HZ,
+		0x3F, 261000,
+		{1792, 96, 216, 352, 2456, 1,
+		1344, 1, 3, 69, 1417, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1856x1392_75_P, "1856x1392@75Hz", XVID_FR_75HZ,
+		0x42, 288000,
+		{1856, 128, 224, 352, 2560, 1,
+		1392, 1, 3, 104, 1500, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1920x1200_75_P, "1920x1200@75Hz", XVID_FR_75HZ,
+		0x46, 245250,
+		{1920, 136, 208, 344, 2608, 1,
+		1200, 3, 6, 46, 1255, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1920x1440_75_P, "1920x1440@75Hz", XVID_FR_75HZ,
+		0x4A, 297000,
+		{1920, 144, 224, 352, 2640, 1,
+		1440, 1, 3, 56, 1500, 0, 0, 0, 0, 0} },
+	{ XVID_VM_2560x1600_75_P, "2560x1600@75Hz", XVID_FR_75HZ,
+		0x4E, 443250,
+		{2560, 208, 280, 488, 3536, 1,
+		1600, 3, 6, 63, 1672, 0, 0, 0, 0, 0} },
+	{ XVID_VM_640x350_85_P, "640x350@85Hz", XVID_FR_85HZ,
+		0x01, 31500,
+		{640, 32, 64, 96, 832, 0,
+		350, 32, 3, 60, 445, 0, 0, 0, 0, 1} },
+	{ XVID_VM_640x400_85_P, "640x400@85Hz", XVID_FR_85HZ,
+		0x02, 31500,
+		{640, 32, 64, 96, 832, 1,
+		400, 1, 3, 41, 445, 0, 0, 0, 0, 0} },
+	{ XVID_VM_720x400_85_P,      "720x400@85Hz", XVID_FR_85HZ,
+		0x03, 35500,
+		{720, 36, 72, 108, 936, 1,
+		400, 1, 3, 42, 446, 0, 0, 0, 0, 0} },
+	{ XVID_VM_640x480_85_P, "640x480@85Hz", XVID_FR_85HZ,
+		0x07, 36000,
+		{640, 56, 56, 80, 832, 1,
+		480, 1, 3, 25, 509, 0, 0, 0, 0, 1} },
+	{ XVID_VM_800x600_85_P, "800x600@85Hz", XVID_FR_85HZ,
+		0x0C, 56250,
+		{800, 32, 64, 152, 1048, 0,
+		600, 1, 3, 27, 631, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1024x768_85_P, "1024x768@85Hz", XVID_FR_85HZ,
+		0x13, 94500,
+		{1024, 48, 96, 208, 1376, 0,
+		768, 1, 3, 36, 808, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x768_85_P, "1280x768@85Hz", XVID_FR_85HZ,
+		0x19, 117500,
+		{1280, 80, 136, 216, 1712, 1,
+		768, 3, 7, 31, 809, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x800_85_P, "1280x800@85Hz", XVID_FR_85HZ,
+		0x1E, 122500,
+		{1280, 80, 136, 216, 1712, 1,
+		800, 3, 6, 34, 843, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x960_85_P, "1280x960@85Hz", XVID_FR_85HZ,
+		0x21, 148500,
+		{1280, 64, 160, 224, 1728, 0,
+		960, 1, 3, 47, 1011, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1280x1024_85_P, "1280x1024@85Hz", XVID_FR_85HZ,
+		0x25, 157500,
+		{1280, 64, 160, 224, 1728, 0,
+		1024, 1, 3, 44, 1072, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1400x1050_85_P, "1400x1050@85Hz", XVID_FR_85HZ,
+		0x2C, 179500,
+		{1400, 104, 152, 256, 1912, 1,
+		1050, 3, 4, 48, 1105, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1440x900_85_P, "1440x900@85Hz", XVID_FR_85HZ,
+		0x31, 157000,
+		{1440, 104, 152, 32, 1728, 1,
+		900, 3, 6, 39, 948, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1600x1200_85_P, "1600x1200@85Hz", XVID_FR_85HZ,
+		0x37, 229500,
+		{1600, 64, 192, 304, 2160, 0,
+		1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1680x1050_85_P, "1680x1050@85Hz", XVID_FR_85HZ,
+		0x3C, 214750,
+		{1680, 128, 176, 304, 2288, 1,
+		1050, 3, 6, 46, 1105, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1920x1200_85_P, "1920x1200@85Hz", XVID_FR_85HZ,
+		0x47, 281250,
+		{1920, 144, 208, 352, 2624, 1,
+		1200, 3, 6, 53, 1262, 0, 0, 0, 0, 0} },
+	{ XVID_VM_2560x1600_85_P, "2560x1600@85Hz", XVID_FR_85HZ,
+		0x4F, 505250,
+		{2560, 208, 280, 488, 3536, 1,
+		1600, 3, 6, 73, 1682, 0, 0, 0, 0, 0} },
+	{ XVID_VM_800x600_120_P_RB, "800x700@120Hz (RB)", XVID_FR_120HZ,
+		0x0D, 73250,
+		{800, 48, 32, 80, 960, 0,
+		600, 3, 4, 29, 636, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1024x768_120_P_RB, "1024x768@120Hz (RB)", XVID_FR_120HZ,
+		0x14, 115500,
+		{1024, 48, 32, 80, 1184, 0,
+		768, 3, 4, 38, 813, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x768_120_P_RB, "1280x768@120Hz (RB)", XVID_FR_120HZ,
+		0x1A, 140250,
+		{1280, 48, 32, 80, 1440, 0,
+		768, 3, 7, 35, 813, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x800_120_P_RB, "1280x800@120Hz (RB)", XVID_FR_120HZ,
+		0x1F, 146250,
+		{1280, 48, 32, 80, 1440, 0,
+		800, 3, 6, 38, 847, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x960_120_P_RB, "1280x960@120Hz (RB)", XVID_FR_120HZ,
+		0x22, 175500,
+		{1280, 48, 32, 80, 1440, 0,
+		960, 3, 4, 50, 1017, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1280x1024_120_P_RB, "1280x1024@120Hz (RB)", XVID_FR_120HZ,
+		0x26, 187250,
+		{1280, 48, 32, 80, 1440, 0,
+		1024, 3, 7, 50, 1084, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1360x768_120_P_RB, "1360x768@120Hz (RB)", XVID_FR_120HZ,
+		0x28, 148250,
+		{1360, 48, 32, 80, 1520, 0,
+		768, 3, 5, 37, 813, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1400x1050_120_P_RB, "1400x1050@120Hz (RB)", XVID_FR_120HZ,
+		0x2D, 208000,
+		{1400, 48, 32, 80, 1560, 0,
+		1050, 3, 4, 55, 1112, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1440x900_120_P_RB, "1440x900@120Hz (RB)", XVID_FR_120HZ,
+		0x32, 182750,
+		{1440, 48, 32, 80, 1600, 0,
+		900, 3, 6, 44, 953, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1600x1200_120_P_RB, "1600x1200@120Hz (RB)", XVID_FR_120HZ,
+		0x38, 268250,
+		{1600, 48, 32, 80, 1760, 0,
+		1200, 3, 4, 64, 1271, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1680x1050_120_P_RB, "1680x1050@120Hz (RB)", XVID_FR_120HZ,
+		0x3D, 245500,
+		{1680, 48, 32, 80, 1840, 0,
+		1050, 3, 6, 53, 1112, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1792x1344_120_P_RB, "1792x1344@120Hz (RB)", XVID_FR_120HZ,
+		0x40, 333250,
+		{1792, 48, 32, 80, 1952, 0,
+		1344, 3, 4, 72, 1423, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1856x1392_120_P_RB, "1856x1392@120Hz (RB)", XVID_FR_120HZ,
+		0x43, 356500,
+		{1856, 48, 32, 80, 2016, 0,
+		1392, 3, 4, 75, 1474, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1920x1200_120_P_RB, "1920x1200@120Hz (RB)", XVID_FR_120HZ,
+		0x48, 317000,
+		{1920, 48, 32, 80, 2080, 0,
+		1200, 3, 6, 62, 1271, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1920x1440_120_P_RB, "1920x1440@120Hz (RB)", XVID_FR_120HZ,
+		0x4B, 380500,
+		{1920, 48, 32, 80, 2080, 0,
+		1440, 3, 4, 78, 1525, 0, 0, 0, 0, 1} },
+	{ XVID_VM_2560x1600_120_P_RB, "2560x1600@120Hz (RB)", XVID_FR_120HZ,
+		0x50, 552750,
+		{2560, 48, 32, 80, 2720, 0,
+		1600, 3, 6, 85, 1694, 0, 0, 0, 0, 1} },
+
+	/* Progressive modes - non-DMT. */
+	{ XVID_VM_480_60_P, "480p@60Hz", XVID_FR_60HZ,
+		0x00, 27027,
+		{720, 16, 62, 60, 858, 1,
+		480, 9, 6, 30, 525, 0, 0, 0, 0, 1} },
+	{ XVID_VM_720_50_P, "1280x720", XVID_FR_50HZ,
+		0x00, 0,
+		{1280, 440, 40, 220, 1980, 1,
+		720, 5, 5, 20, 750, 0, 0, 0, 0, 1} },
+	{ XVID_VM_720_60_P, "720p@60Hz", XVID_FR_60HZ,
+		0x00, 74250,
+		{1280, 110, 40, 220, 1650, 1,
+		720, 5, 5, 20, 750, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1366x768_60_P, "1366x768@60Hz", XVID_FR_60HZ,
+		0x00, 72000,
+		{1366, 14, 56, 64, 1500, 0,
+		768, 1, 3, 28, 800, 0, 0, 0, 0, 0} },
+	{ XVID_VM_1080_24_P, "1920x1080", XVID_FR_24HZ,
+		0x00, 0,
+		{1920, 638, 44, 148, 2750, 1,
+		1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1080_25_P, "1920x1080", XVID_FR_25HZ,
+		0x00, 0,
+		{1920, 528, 44, 148, 2640, 1,
+		1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1080_30_P, "1920x1080", XVID_FR_30HZ,
+		0x00, 0,
+		{1920, 88, 44, 148, 2200, 1,
+		1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1080_50_P, "1920x1080", XVID_FR_50HZ,
+		0x00, 0,
+		{1920, 528, 44, 148, 2640, 1,
+		1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
+	{ XVID_VM_1080_60_P, "1920x1080@60Hz", XVID_FR_60HZ,
+		0x00, 148500,
+		{1920, 88, 44, 148, 2200, 1,
+		1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
+	{ XVID_VM_UHD2_60_P, "UHD/2@60Hz", XVID_FR_60HZ,
+		0x00, 297000,
+		{1920, 88, 44, 148, 2200, 0,
+		2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} },
+	{ XVID_VM_UHD_30_P, "UHD@30Hz", XVID_FR_30HZ,
+		0x00, 297000,
+		{3840, 176, 88, 296, 4400, 0,
+		2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} },
+	{ XVID_VM_UHD_60_P, "UHD@60Hz", XVID_FR_60HZ,
+		0x00, 594000,
+		{3840, 176, 88, 296, 4400, 0,
+		2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} },
+	{ XVID_VM_4K2K_24_P, "3840x2160", XVID_FR_24HZ,
+		0x00, 0,
+		{3840, 1276, 88, 296, 5500, 1,
+		2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} },
+	{ XVID_VM_4K2K_25_P, "3840x2160", XVID_FR_25HZ,
+		0x00, 0,
+		{3840, 1056, 88, 296, 5280, 1,
+		2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} },
+	{ XVID_VM_4K2K_30_P, "3840x2160", XVID_FR_30HZ,
+		0x00, 0,
+		{3840, 176, 88, 296, 4400, 1,
+		2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} },
+	{ XVID_VM_4K2K_60_P, "3840x2160", XVID_FR_60HZ,
+		0x00, 0,
+		{3840, 176, 80, 304, 4400, 1, 2160,
+		60, 8, 22, 2250, 0, 0, 0, 0, 1} },
 
-const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT_1] =
-{
-	//        Res_ID       Name       Frame Rate     HAct    HFP   HSW  HBP   HTOT  HSP  VAct  V0FP V0SW V0BP V0TOT V1FP V1SW V1BP V1TOT VSP
-	/* Video - interlaced modes. */
-	{XVID_VM_576I25,   "720x576",   XVID_FR_25HZ,  { 720,   12,   63,   69,   864,  0,   288,   2,  3,   19,  312,  2,   3,  20,   313,  0}},
-	{XVID_VM_480I30,   "720x480",   XVID_FR_30HZ,  { 720,   19,   62,   57,   858,  0,   240,   4,  3,   15,  262,  4,   3,  16,   263,  0}},
-	{XVID_VM_1080I25,  "1920x1080", XVID_FR_25HZ,  {1920,   88,   44,  148,  2200,  1,   540,   2,  5,   15,  562,  2,   5,  16,   563,  1}},
-	{XVID_VM_1080I30,  "1920x1080", XVID_FR_30HZ,  {1920,   88,   44,  148,  2200,  1,   540,   2,  5,   15,  562,  2,   5,  16,   563,  1}},
-	/* Video - progressive modes. */
-	{XVID_VM_480P60,   "720x480",   XVID_FR_60HZ,  { 720,   16,   62,   60,   858,  1,   480,   9,  6,   30,  525,  0,   0,   0,     0,  1}},
-	{XVID_VM_720P50,   "1280x720",  XVID_FR_50HZ,  {1280,  440,   40,  220,  1980,  1,   720,   5,  5,   20,  750,  0,   0,   0,     0,  1}},
-	{XVID_VM_720P60,   "1280x720",  XVID_FR_60HZ,  {1280,  110,   40,  220,  1650,  1,   720,   5,  5,   20,  750,  0,   0,   0,     0,  1}},
-	{XVID_VM_1080P24,  "1920x1080", XVID_FR_24HZ,  {1920,  638,   44,  148,  2750,  1,  1080,   4,  5,   36, 1125,  0,   0,   0,     0,  1}},
-	{XVID_VM_1080P25,  "1920x1080", XVID_FR_25HZ,  {1920,  528,   44,  148,  2640,  1,  1080,   4,  5,   36, 1125,  0,   0,   0,     0,  1}},
-	{XVID_VM_1080P30,  "1920x1080", XVID_FR_30HZ,  {1920,   88,   44,  148,  2200,  1,  1080,   4,  5,   36, 1125,  0,   0,   0,     0,  1}},
-	{XVID_VM_1080P50,  "1920x1080", XVID_FR_50HZ,  {1920,  528,   44,  148,  2640,  1,  1080,   4,  5,   36, 1125,  0,   0,   0,     0,  1}},
-	{XVID_VM_1080P60,  "1920x1080", XVID_FR_60HZ,  {1920,   88,   44,  148,  2200,  1,  1080,   4,  5,   36, 1125,  0,   0,   0,     0,  1}},
-	{XVID_VM_4K2KP24,  "3840x2160", XVID_FR_24HZ,  {3840, 1276,   88,  296,  5500,  1,  2160,   8, 10,   72, 2250,  0,   0,   0,     0,  1}},
-	{XVID_VM_4K2KP25,  "3840x2160", XVID_FR_25HZ,  {3840, 1056,   88,  296,  5280,  1,  2160,   8, 10,   72, 2250,  0,   0,   0,     0,  1}},
-	{XVID_VM_4K2KP30,  "3840x2160", XVID_FR_30HZ,  {3840,  176,   88,  296,  4400,  1,  2160,   8, 10,   72, 2250,  0,   0,   0,     0,  1}},
-	{XVID_VM_4K2KP60,  "3840x2160", XVID_FR_60HZ,  {3840,  176,   80,  304,  4400,  1,  2160,  60,  8,   22, 2250,  0,   0,   0,     0,  1}},
 	/* PC resolutions. */
-	{XVID_VM_WXGAP60,  "1366x768",  XVID_FR_60HZ,  {1366,   70,  143,  213,  1792,  1,   768,   3,  3,   24,  798,  0,   0,   0,     0,  1}},
-	{XVID_VM_UXGAP60,  "1600x1200", XVID_FR_60HZ,  {1600,   64,  192,  304,  2160,  1,  1200,   1,  3,   46, 1250,  0,   0,   0,     0,  1}},
-	{XVID_VM_WUXGAP60, "1920x1200", XVID_FR_60HZ,  {1920,  136,  200,  336,  2592,  1,  1200,   3,  6,   36, 1245,  0,   0,   0,     0,  1}},
-	{XVID_VM_WSXGAP60, "1680x1050", XVID_FR_60HZ,  {1680,  104,  176,  280,  2240,  1,  1050,   3,  6,   30, 1089,  0,   0,   0,     0,  1}}
+	{ XVID_VM_WXGA_60_P,  "1366x768",  XVID_FR_60HZ,
+		0x00, 0,
+		{1366, 70, 143, 213, 1792, 1,
+		768, 3, 3, 24, 798, 0, 0, 0, 0, 1} },
+	{ XVID_VM_UXGA_60_P,  "1600x1200", XVID_FR_60HZ,
+		0x00, 0,
+		{1600, 64, 192, 304, 2160, 1,
+		1200, 1, 3, 46, 1250, 0, 0, 0, 0, 1} },
+		/* XVID_VM_1600x1200_60_P */
+	{ XVID_VM_WUXGA_60_P, "1920x1200", XVID_FR_60HZ,
+		0x00, 0,
+		{1920, 136, 200, 336, 2592, 1,
+		1200, 3, 6, 36, 1245, 0, 0, 0, 0, 1} },
+		/* XVID_VM_1920x1200_60_P */
+	{ XVID_VM_WSXGA_60_P, "1680x1050", XVID_FR_60HZ,
+		{1680, 104, 176, 280, 2240, 1,
+		1050, 3, 6, 30, 1089, 0, 0, 0, 0, 1} },
+		/* XVID_VM_1680x1050_60_P */
+
+	/* Interlaced modes. */
+	{ XVID_VM_480_30_I, "720x480", XVID_FR_30HZ,
+		0x00, 0,
+		{720, 19, 62, 57, 858, 0,
+		240, 4, 3, 15, 262, 4, 3, 16, 263, 0} },
+	{ XVID_VM_576_25_I, "720x576", XVID_FR_25HZ,
+		0x00, 0,
+		{720, 12, 63, 69, 864, 0,
+		288, 2, 3, 19, 312, 2, 3, 20, 313, 0} },
+	{ XVID_VM_1080_25_I, "1920x1080", XVID_FR_25HZ,
+		0x00, 0,
+		{1920, 88, 44, 148, 2200, 1,
+		540, 2, 5, 15, 562, 2, 5, 16, 563, 1} },
+	{ XVID_VM_1080_30_I, "1920x1080", XVID_FR_30HZ,
+		0x00, 0,
+		{1920, 88, 44, 148, 2200, 1,
+		540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }
 };