diff options
-rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 27c28a0c60d..36b49fb3792 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -222,6 +222,7 @@ static const struct omap_video_timings all_timings_direct[] = { {1680, 1050, 119000, 32, 48, 80, 6, 3, 21}, {1280, 800, 79500, 32, 48, 80, 6, 3, 14}, {1280, 720, 74250, 40, 110, 220, 5, 5, 20}, + {1920, 1200, 154000, 32, 48, 80, 6, 3, 26}, /* supported 3d timings UNDEROVER full frame */ {1280, 1470, 148350, 40, 110, 220, 5, 5, 20}, {1280, 1470, 148500, 40, 110, 220, 5, 5, 20}, @@ -234,8 +235,8 @@ static int code_index[ARRAY_SIZE(all_timings_direct)] = { 29, 31, 35, 32, /* <--15 CEA 22--> vesa*/ 4, 9, 0xE, 0x17, 0x1C, 0x27, 0x20, 0x23, 0x10, 0x2A, - 0X2F, 0x3A, 0X51, 0X52, 0x16, 0x29, 0x39, 0x1B, 0x55, 4, - 4, 19 + 0X2F, 0x3A, 0X51, 0X52, 0x16, 0x29, 0x39, 0x1B, 0x55, 0X2C, + 4, 4, 19, }; /* Mapping the Timing values with the corresponding Vsync and Hsync polarity */ @@ -249,8 +250,8 @@ struct hdmi_hvsync_pol hvpol_mapping[ARRAY_SIZE(all_timings_direct)] = { {1, 0}, {1, 1}, {1, 1}, {1, 1}, {0, 0}, {1, 0}, {1, 0}, {1, 0}, {1, 1}, {1, 1}, {0, 1}, {0, 1}, - {0, 1}, {0, 1}, {1, 1}, {1, 1}, - {1, 1}, {1, 1} + {0, 1}, {0, 1}, {1, 1}, {1, 0}, + {1, 1}, {1, 1}, {1, 1} }; /* Map CEA code to the corresponding timing values (10 entries/line) */ @@ -263,8 +264,8 @@ static int code_cea[39] = { /* Map CEA code to the corresponding 3D timing values */ static int s3d_code_cea[39] = { - -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 36, + -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; @@ -275,7 +276,7 @@ static int code_vesa[86] = { -1, -1, -1, -1, 17, -1, 23, -1, -1, -1, -1, -1, 29, 18, -1, -1, -1, 32, 19, -1, -1, -1, 21, -1, -1, 22, -1, -1, -1, 20, - -1, 30, 24, -1, -1, -1, -1, 25, -1, -1, + -1, 30, 24, -1, 34, -1, -1, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, 31, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, |