1 files changed, 52 insertions, 0 deletions

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 0a4dbdc1693a..d2bb365f09b3 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -274,10 +274,61 @@ static const struct fb_videomode modedb[] = {
        /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */
        NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5,
        0, FB_VMODE_INTERLACED
+    }, {
+        /* 864x480 @ 60 Hz, 35.15 kHz hsync */
+        NULL, 60, 864, 480, 27777, 1, 1, 1, 1, 0, 0,
+        0, FB_VMODE_NONINTERLACED
     },
 };
 
 #ifdef CONFIG_FB_MODE_HELPERS
+const struct fb_videomode cea_modes[64] = {
+        /* #1: 640x480p@59.94/60Hz */
+        [1] = {
+                NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0, FB_VMODE_NONINTERLACED, 0,
+        },
+        /* #3: 720x480p@59.94/60Hz */
+        [3] = {
+                NULL, 60, 720, 480, 37037, 60, 16, 30, 9, 62, 6, 0, FB_VMODE_NONINTERLACED, 0,
+        },
+        /* #5: 1920x1080i@59.94/60Hz */
+        [5] = {
+                NULL, 60, 1920, 1080, 13763, 148, 88, 15, 2, 44, 5,
+                FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,
+        },
+        /* #7: 720(1440)x480iH@59.94/60Hz */
+        [7] = {
+                NULL, 60, 1440, 480, 18554/*37108*/, 114, 38, 15, 4, 124, 3, 0, FB_VMODE_INTERLACED, 0,
+        },
+        /* #9: 720(1440)x240pH@59.94/60Hz */
+        [9] = {
+                NULL, 60, 1440, 240, 18554, 114, 38, 16, 4, 124, 3, 0, FB_VMODE_NONINTERLACED, 0,
+        },
+        /* #18: 720x576pH@50Hz */
+        [18] = {
+                NULL, 50, 720, 576, 37037, 68, 12, 39, 5, 64, 5, 0, FB_VMODE_NONINTERLACED, 0,
+        },
+        /* #19: 1280x720p@50Hz */
+        [19] = {
+                NULL, 50, 1280, 720, 13468, 220, 440, 20, 5, 40, 5,
+                FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,
+        },
+        /* #20: 1920x1080i@50Hz */
+        [20] = {
+                NULL, 50, 1920, 1080, 13480, 148, 528, 15, 5, 528, 5,
+                FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,
+        },
+        /* #32: 1920x1080p@23.98/24Hz */
+        [32] = {
+                NULL, 24, 1920, 1080, 13468, 148, 638, 36, 4, 44, 5,
+                FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,
+        },
+        /* #35: (2880)x480p4x@59.94/60Hz */
+        [35] = {
+                NULL, 60, 2880, 480, 9250, 240, 64, 30, 9, 248, 6, 0, FB_VMODE_NONINTERLACED, 0,
+        },
+};
+
 const struct fb_videomode vesa_modes[] = {
         /* 0 640x350-85 VESA */
         { NULL, 85, 640, 350, 31746,  96, 32, 60, 32, 64, 3,
@@ -855,6 +906,7 @@ const struct fb_videomode *fb_find_nearest_mode(const struct fb_videomode *mode,
                         abs(cmode->yres - mode->yres);
                 if (diff > d) {
                         diff = d;
+                        diff_refresh = abs(cmode->refresh - mode->refresh);
                         best = cmode;
                 } else if (diff == d) {
                         d = abs(cmode->refresh - mode->refresh);