From 954a4047fdd39cd451fc49c89e18f76dd37b868e Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 18:54:44 -0800 Subject: [PATCH] video_common: XVID_VM_UHD_60_P->XVID_VM_3840x2160_60_P. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/video_common/src/xvid.h | 4 ++-- .../drivers/video_common/src/xvid_timings_table.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index 4e8890e8..68dc1ea6 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -159,8 +159,7 @@ typedef enum { XVID_VM_3840x2160_24_P, XVID_VM_3840x2160_25_P, XVID_VM_3840x2160_30_P, - - XVID_VM_UHD_60_P, + XVID_VM_3840x2160_60_P, XVID_VM_480_30_I, XVID_VM_576_25_I, @@ -187,6 +186,7 @@ typedef enum { XVID_VM_UHD_24_P = XVID_VM_3840x2160_24_P, XVID_VM_UHD_25_P = XVID_VM_3840x2160_25_P, XVID_VM_UHD_30_P = XVID_VM_3840x2160_30_P + XVID_VM_UHD_60_P = XVID_VM_3840x2160_60_P } XVid_VideoMode; typedef enum { diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index 9492201b..0abd4193 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -438,8 +438,7 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 297000, {3840, 176, 88, 296, 4400, 0, 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} }, - - { XVID_VM_UHD_60_P, "3840x2160@60Hz", XVID_FR_60HZ, + { XVID_VM_3840x2160_60_P, "3840x2160@60Hz", XVID_FR_60HZ, 594000, {3840, 176, 88, 296, 4400, 0, 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} },