From c741680e7ac1fe8925e188a32559a2cf3ea8865e Mon Sep 17 00:00:00 2001
From: Andrei-Liviu Simion <andrei.simion@xilinx.com>
Date: Mon, 16 Feb 2015 09:57:27 -0800
Subject: [PATCH] video_common: Reordered reduced blanking timings after
regular blanking.
The XVidC_GetVideoModeId search would return reduced blanking. This causes
problems if the monitor doesn't support reduced blanking or if the user desired
regular blanking.
Prioritize regular blanking first - it is up to the user to specify if reduced
blanking is desired.
Signed-off-by: Andrei-Liviu Simion <andrei.simion@xilinx.com>
---
.../drivers/video_common/src/xvidc.h | 14 +++----
.../video_common/src/xvidc_timings_table.c | 42 +++++++++----------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h
index ba67d1f1..36813a2c 100644
--- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h
+++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h
@@ -99,13 +99,13 @@ typedef enum {
XVIDC_VM_1152x864_75_P,
XVIDC_VM_1280x720_50_P,
XVIDC_VM_1280x720_60_P,
- XVIDC_VM_1280x768_60_P_RB,
XVIDC_VM_1280x768_60_P,
+ XVIDC_VM_1280x768_60_P_RB,
XVIDC_VM_1280x768_75_P,
XVIDC_VM_1280x768_85_P,
XVIDC_VM_1280x768_120_P_RB,
- XVIDC_VM_1280x800_60_P_RB,
XVIDC_VM_1280x800_60_P,
+ XVIDC_VM_1280x800_60_P_RB,
XVIDC_VM_1280x800_75_P,
XVIDC_VM_1280x800_85_P,
XVIDC_VM_1280x800_120_P_RB,
@@ -119,13 +119,13 @@ typedef enum {
XVIDC_VM_1360x768_60_P,
XVIDC_VM_1360x768_120_P_RB,
XVIDC_VM_1366x768_60_P,
- XVIDC_VM_1400x1050_60_P_RB,
XVIDC_VM_1400x1050_60_P,
+ XVIDC_VM_1400x1050_60_P_RB,
XVIDC_VM_1400x1050_75_P,
XVIDC_VM_1400x1050_85_P,
XVIDC_VM_1400x1050_120_P_RB,
- XVIDC_VM_1440x900_60_P_RB,
XVIDC_VM_1440x900_60_P,
+ XVIDC_VM_1440x900_60_P_RB,
XVIDC_VM_1440x900_75_P,
XVIDC_VM_1440x900_85_P,
XVIDC_VM_1440x900_120_P_RB,
@@ -135,8 +135,8 @@ typedef enum {
XVIDC_VM_1600x1200_75_P,
XVIDC_VM_1600x1200_85_P,
XVIDC_VM_1600x1200_120_P_RB,
- XVIDC_VM_1680x1050_60_P_RB,
XVIDC_VM_1680x1050_60_P,
+ XVIDC_VM_1680x1050_60_P_RB,
XVIDC_VM_1680x1050_75_P,
XVIDC_VM_1680x1050_85_P,
XVIDC_VM_1680x1050_120_P_RB,
@@ -151,8 +151,8 @@ typedef enum {
XVIDC_VM_1920x1080_30_P,
XVIDC_VM_1920x1080_50_P,
XVIDC_VM_1920x1080_60_P,
- XVIDC_VM_1920x1200_60_P_RB,
XVIDC_VM_1920x1200_60_P,
+ XVIDC_VM_1920x1200_60_P_RB,
XVIDC_VM_1920x1200_75_P,
XVIDC_VM_1920x1200_85_P,
XVIDC_VM_1920x1200_120_P_RB,
@@ -160,8 +160,8 @@ typedef enum {
XVIDC_VM_1920x1440_75_P,
XVIDC_VM_1920x1440_120_P_RB,
XVIDC_VM_1920x2160_60_P,
- XVIDC_VM_2560x1600_60_P_RB,
XVIDC_VM_2560x1600_60_P,
+ XVIDC_VM_2560x1600_60_P_RB,
XVIDC_VM_2560x1600_75_P,
XVIDC_VM_2560x1600_85_P,
XVIDC_VM_2560x1600_120_P_RB,
diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c
index e9f4f99b..00cd2044 100644
--- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c
+++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c
@@ -165,12 +165,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1280x720_60_P, "720p@60Hz", XVIDC_FR_60HZ,
{1280, 110, 40, 220, 1650, 0,
720, 5, 5, 20, 750, 0, 0, 0, 0, 0} },
- { XVIDC_VM_1280x768_60_P_RB, "1280x768@60Hz (RB)", XVIDC_FR_60HZ,
- {1280, 48, 32, 80, 1440, 1,
- 768, 3, 7, 12, 790, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1280x768_60_P, "1280x768@60Hz", XVIDC_FR_60HZ,
{1280, 64, 128, 192, 1664, 0,
768, 3, 7, 20, 798, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_1280x768_60_P_RB, "1280x768@60Hz (RB)", XVIDC_FR_60HZ,
+ {1280, 48, 32, 80, 1440, 1,
+ 768, 3, 7, 12, 790, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1280x768_75_P, "1280x768@75Hz", XVIDC_FR_75HZ,
{1280, 80, 128, 208, 1696, 0,
768, 3, 7, 27, 805, 0, 0, 0, 0, 1} },
@@ -180,12 +180,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1280x768_120_P_RB, "1280x768@120Hz (RB)", XVIDC_FR_120HZ,
{1280, 48, 32, 80, 1440, 1,
768, 3, 7, 35, 813, 0, 0, 0, 0, 0} },
- { XVIDC_VM_1280x800_60_P_RB, "1280x800@60Hz (RB)", XVIDC_FR_60HZ,
- {1280, 48, 32, 80, 1440, 1,
- 800, 3, 6, 14, 823, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1280x800_60_P, "1280x800@60Hz", XVIDC_FR_60HZ,
{1280, 72, 128, 200, 1680, 0,
800, 3, 6, 22, 831, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_1280x800_60_P_RB, "1280x800@60Hz (RB)", XVIDC_FR_60HZ,
+ {1280, 48, 32, 80, 1440, 1,
+ 800, 3, 6, 14, 823, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1280x800_75_P, "1280x800@75Hz", XVIDC_FR_75HZ,
{1280, 80, 128, 208, 1696, 0,
800, 3, 6, 29, 838, 0, 0, 0, 0, 1} },
@@ -225,12 +225,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1366x768_60_P, "1366x768@60Hz", XVIDC_FR_60HZ,
{1366, 14, 56, 64, 1500, 1,
768, 1, 3, 28, 800, 0, 0, 0, 0, 1} },
- { XVIDC_VM_1400x1050_60_P_RB, "1400x1050@60Hz (RB)", XVIDC_FR_60HZ,
- {1400, 48, 32, 80, 1560, 1,
- 1050, 3, 4, 23, 1080, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1400x1050_60_P, "1400x1050@60Hz", XVIDC_FR_60HZ,
{1400, 88, 144, 232, 1864, 0,
1050, 3, 4, 32, 1089, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_1400x1050_60_P_RB, "1400x1050@60Hz (RB)", XVIDC_FR_60HZ,
+ {1400, 48, 32, 80, 1560, 1,
+ 1050, 3, 4, 23, 1080, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1400x1050_75_P, "1400x1050@75Hz", XVIDC_FR_75HZ,
{1400, 104, 144, 248, 1896, 0,
1050, 3, 4, 42, 1099, 0, 0, 0, 0, 1} },
@@ -240,12 +240,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1400x1050_120_P_RB, "1400x1050@120Hz (RB)", XVIDC_FR_120HZ,
{1400, 48, 32, 80, 1560, 1,
1050, 3, 4, 55, 1112, 0, 0, 0, 0, 0} },
- { XVIDC_VM_1440x900_60_P_RB, "1440x900@60Hz (RB)", XVIDC_FR_60HZ,
- {1440, 48, 32, 80, 1600, 1,
- 900, 3, 6, 17, 926, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1440x900_60_P, "1440x900@60Hz", XVIDC_FR_60HZ,
{1440, 80, 152, 232, 1904, 0,
900, 3, 6, 25, 934, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_1440x900_60_P_RB, "1440x900@60Hz (RB)", XVIDC_FR_60HZ,
+ {1440, 48, 32, 80, 1600, 1,
+ 900, 3, 6, 17, 926, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1440x900_75_P, "1440x900@75Hz", XVIDC_FR_75HZ,
{1440, 96, 152, 248, 1936, 0,
900, 3, 6, 33, 942, 0, 0, 0, 0, 1} },
@@ -273,12 +273,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1600x1200_120_P_RB, "1600x1200@120Hz (RB)", XVIDC_FR_120HZ,
{1600, 48, 32, 80, 1760, 1,
1200, 3, 4, 64, 1271, 0, 0, 0, 0, 0} },
- { XVIDC_VM_1680x1050_60_P_RB, "1680x1050@60Hz (RB)", XVIDC_FR_60HZ,
- {1680, 48, 32, 80, 1840, 1,
- 1050, 3, 6, 21, 1080, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1680x1050_60_P, "1680x1050@60Hz", XVIDC_FR_60HZ,
{1680, 104, 176, 280, 2240, 0,
1050, 3, 6, 30, 1089, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_1680x1050_60_P_RB, "1680x1050@60Hz (RB)", XVIDC_FR_60HZ,
+ {1680, 48, 32, 80, 1840, 1,
+ 1050, 3, 6, 21, 1080, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1680x1050_75_P, "1680x1050@75Hz", XVIDC_FR_75HZ,
{1680, 120, 176, 296, 2272, 0,
1050, 3, 6, 40, 1099, 0, 0, 0, 0, 1} },
@@ -321,12 +321,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1920x1080_60_P, "1920x1080@60Hz", XVIDC_FR_60HZ,
{1920, 88, 44, 148, 2200, 0,
1080, 4, 5, 36, 1125, 0, 0, 0, 0, 0} },
- { XVIDC_VM_1920x1200_60_P_RB, "1920x1200@60Hz (RB)", XVIDC_FR_60HZ,
- {1920, 48, 32, 80, 2080, 1,
- 1200, 3, 6, 26, 1235, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1920x1200_60_P, "1920x1200@60Hz", XVIDC_FR_60HZ,
{1920, 136, 200, 336, 2592, 0,
1200, 3, 6, 36, 1245, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_1920x1200_60_P_RB, "1920x1200@60Hz (RB)", XVIDC_FR_60HZ,
+ {1920, 48, 32, 80, 2080, 1,
+ 1200, 3, 6, 26, 1235, 0, 0, 0, 0, 0} },
{ XVIDC_VM_1920x1200_75_P, "1920x1200@75Hz", XVIDC_FR_75HZ,
{1920, 136, 208, 344, 2608, 0,
1200, 3, 6, 46, 1255, 0, 0, 0, 0, 1} },
@@ -348,12 +348,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_1920x2160_60_P, "1920x2160@60Hz", XVIDC_FR_60HZ,
{1920, 88, 44, 148, 2200, 1,
2160, 20, 10, 60, 2250, 0, 0, 0, 0, 0} },
- { XVIDC_VM_2560x1600_60_P_RB, "2560x1600@60Hz (RB)", XVIDC_FR_60HZ,
- {2560, 48, 32, 80, 2720, 1,
- 1600, 3, 6, 37, 1646, 0, 0, 0, 0, 0} },
{ XVIDC_VM_2560x1600_60_P, "2560x1600@60Hz", XVIDC_FR_60HZ,
{2560, 192, 280, 472, 3504, 0,
1600, 3, 6, 49, 1658, 0, 0, 0, 0, 1} },
+ { XVIDC_VM_2560x1600_60_P_RB, "2560x1600@60Hz (RB)", XVIDC_FR_60HZ,
+ {2560, 48, 32, 80, 2720, 1,
+ 1600, 3, 6, 37, 1646, 0, 0, 0, 0, 0} },
{ XVIDC_VM_2560x1600_75_P, "2560x1600@75Hz", XVIDC_FR_75HZ,
{2560, 208, 280, 488, 3536, 0,
1600, 3, 6, 63, 1672, 0, 0, 0, 0, 1} },