From 8e32372c3d1765fcee5c98210fc8d617a505b946 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 18:48:20 -0800 Subject: [PATCH] video_common: 3840x2160 is UHD, not full 4K2K. Signed-off-by: Andrei-Liviu Simion --- .../drivers/video_common/src/xvid.h | 6 ++--- .../video_common/src/xvid_timings_table.c | 26 +++++++------------ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index 7ae602b0..38c428f2 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -158,11 +158,9 @@ typedef enum { XVID_VM_2560x1600_120_P_RB, XVID_VM_3840x2160_30_P, + XVID_VM_UHD_24_P, + XVID_VM_UHD_25_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_480_30_I, XVID_VM_576_25_I, diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index 960f2ef4..675ff63b 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -431,26 +431,18 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = {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, + { XVID_VM_UHD_24_P, "3840x2160@24Hz", XVID_FR_24HZ, + 297000, + {3840, 1276, 88, 296, 5500, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVID_VM_UHD_25_P, "3840x2160@25Hz", XVID_FR_25HZ, + 297000, + {3840, 1056, 88, 296, 5280, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVID_VM_UHD_60_P, "3840x2160@60Hz", XVID_FR_60HZ, 594000, {3840, 176, 88, 296, 4400, 0, 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_24_P, "3840x2160@24Hz", XVID_FR_24HZ, - 0, - {3840, 1276, 88, 296, 5500, 1, - 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_25_P, "3840x2160@25Hz", XVID_FR_25HZ, - 0, - {3840, 1056, 88, 296, 5280, 1, - 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_30_P, "3840x2160@30Hz", XVID_FR_30HZ, - 0, - {3840, 176, 88, 296, 4400, 1, - 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_60_P, "3840x2160@60Hz", XVID_FR_60HZ, - 0, - {3840, 176, 80, 304, 4400, 1, - 2160, 60, 8, 22, 2250, 0, 0, 0, 0, 1} }, /* Interlaced modes. */ { XVID_VM_480_30_I, "720x480@30Hz (I)", XVID_FR_30HZ,