video: fbdev: Add additional vesa modes

Change-Id: I485601d679687db9a655f06b48929e66883bdadd
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index a9a907c440d73ee89f2acc8fd20d7aa905230b43..cd5c9a1acff524c74ef74374b6a2a76f8c5d7094 100644 (file)
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -471,6 +471,50 @@ const struct fb_videomode vesa_modes[] = {
        /* 33 1920x1440-75 VESA */
        { NULL, 75, 1920, 1440, 3367, 352, 144, 56, 1, 224, 3,
          FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 34 1920x1200-60 RB VESA */
+       { NULL, 60, 1920, 1200, 6493, 80, 48, 26, 3, 32, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 35 1920x1200-60 VESA */
+       { NULL, 60, 1920, 1200, 5174, 336, 136, 36, 3, 200, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 36 1920x1200-75 VESA */
+       { NULL, 75, 1920, 1200, 4077, 344, 136, 46, 3, 208, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 37 1920x1200-85 VESA */
+       { NULL, 85, 1920, 1200, 3555, 352, 144, 53, 3, 208, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 38 2560x1600-60 RB VESA */
+       { NULL, 60, 2560, 1600, 3724, 80, 48, 37, 3, 32, 6,
+         FB_SYNC_HOR_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 39 2560x1600-60 VESA */
+       { NULL, 60, 2560, 1600, 2869, 472, 192, 49, 3, 280, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 40 2560x1600-75 VESA */
+       { NULL, 75, 2560, 1600, 2256, 488, 208, 63, 3, 280, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 41 2560x1600-85 VESA */
+       { NULL, 85, 2560, 1600, 1979, 488, 208, 73, 3, 280, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 42 2560x1600-120 RB VESA */
+       { NULL, 120, 2560, 1600, 1809, 80, 48, 85, 3, 32, 6,
+         FB_SYNC_HOR_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 43 1360x768-60 VESA */
+       { NULL, 60, 1360, 768, 11695, 256, 64, 18, 3, 112, 6,
+         FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+         FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 44 1366x768-60 VESA */
+       { NULL, 60, 1366, 768, 11695, 213, 70, 24, 3, 143, 3,
+         FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+         FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 45 1440x900-60 VESA */
+       { NULL, 60, 1440, 900, 9389, 232, 80, 25, 3, 152, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 46 1600x900-60 VESA */
+       { NULL, 60, 1600, 900, 9259, 96, 24, 96, 1, 80, 3,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+       /* 47 1680x1050-60 VESA */
+       { NULL, 60, 1680, 1050, 6837, 280, 104, 30, 3, 176, 6,
+         FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 };
 EXPORT_SYMBOL(vesa_modes);
 #endif /* CONFIG_FB_MODE_HELPERS */

diff --git a/include/linux/fb.h b/include/linux/fb.h
index d49c60f5aa4c52250e5e5c9549ccb4fdf105d3ce..6173f3dfa26acf8d51cd60f633ec53ad9087f079 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -725,7 +725,7 @@ extern int fb_videomode_from_videomode(const struct videomode *vm,
                                       struct fb_videomode *fbmode);
 
 /* drivers/video/modedb.c */
-#define VESA_MODEDB_SIZE 34
+#define VESA_MODEDB_SIZE 48
 extern void fb_var_to_videomode(struct fb_videomode *mode,
                                const struct fb_var_screeninfo *var);
 extern void fb_videomode_to_var(struct fb_var_screeninfo *var,