From 4dac8016f3845d8645c244212c842d287de49902 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 18:32:45 -0800 Subject: [PATCH] video_common: XVID_VM_1080_60_P->XVID_VM_1920x1080_60_P. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/video_common/src/xvid.h | 3 ++- .../drivers/video_common/src/xvid_timings_table.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index 29547848..b1d0e0b7 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -141,6 +141,7 @@ typedef enum { XVID_VM_1920x1080_25_P, XVID_VM_1920x1080_30_P, XVID_VM_1920x1080_50_P, + XVID_VM_1920x1080_60_P, XVID_VM_1920x1200_60_P_RB, XVID_VM_1920x1200_60_P, XVID_VM_1920x1200_75_P, @@ -155,7 +156,6 @@ typedef enum { XVID_VM_2560x1600_85_P, XVID_VM_2560x1600_120_P_RB, - XVID_VM_1080_60_P, XVID_VM_UHD2_60_P, XVID_VM_UHD_30_P, XVID_VM_UHD_60_P, @@ -183,6 +183,7 @@ typedef enum { XVID_VM_1080_25_P = XVID_VM_1920x1080_25_P, XVID_VM_1080_30_P = XVID_VM_1920x1080_30_P, XVID_VM_1080_50_P = XVID_VM_1920x1080_50_P, + XVID_VM_1080_60_P = XVID_VM_1920x1080_60_P, XVID_VM_WUXGA_60_P = XVID_VM_1920x1200_60_P } XVid_VideoMode; diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index b97ddf9e..bbcc89d4 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -366,6 +366,10 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 103680, {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, + 148500, + {1920, 88, 44, 148, 2200, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, { XVID_VM_1920x1200_60_P_RB, "1920x1200@60Hz (RB)", XVID_FR_60HZ, 154000, {1920, 48, 32, 80, 2080, 0, @@ -419,10 +423,6 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = {2560, 48, 32, 80, 2720, 0, 1600, 3, 6, 85, 1694, 0, 0, 0, 0, 1} }, - { XVID_VM_1080_60_P, "1920x1080@60Hz", XVID_FR_60HZ, - 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, 297000, {1920, 88, 44, 148, 2200, 0,