1 files changed, 73 insertions, 11 deletions

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 47516c44a390..1789a52d776a 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -676,6 +676,8 @@ void fb_var_to_videomode(struct fb_videomode *mode,
         mode->sync = var->sync;
         mode->vmode = var->vmode & FB_VMODE_MASK;
         mode->flag = FB_MODE_IS_FROM_VAR;
+        mode->refresh = 0;
+
         if (!var->pixclock)
                 return;
 
@@ -785,39 +787,39 @@ struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var,
 }
 
 /**
- * fb_find_nearest_mode - find mode closest video mode
+ * fb_find_nearest_mode - find closest videomode
  *
- * @var: pointer to struct fb_var_screeninfo
+ * @mode: pointer to struct fb_videomode
  * @head: pointer to modelist
  *
  * Finds best matching videomode, smaller or greater in dimension.
  * If more than 1 videomode is found, will return the videomode with
- * the closest refresh rate
+ * the closest refresh rate.
  */
-struct fb_videomode *fb_find_nearest_mode(struct fb_var_screeninfo *var,
+struct fb_videomode *fb_find_nearest_mode(struct fb_videomode *mode,
                                           struct list_head *head)
 {
         struct list_head *pos;
         struct fb_modelist *modelist;
-        struct fb_videomode *mode, *best = NULL;
+        struct fb_videomode *cmode, *best = NULL;
         u32 diff = -1, diff_refresh = -1;
 
         list_for_each(pos, head) {
                 u32 d;
 
                 modelist = list_entry(pos, struct fb_modelist, list);
-                mode = &modelist->mode;
+                cmode = &modelist->mode;
 
-                d = abs(mode->xres - var->xres) +
-                        abs(mode->yres - var->yres);
+                d = abs(cmode->xres - mode->xres) +
+                        abs(cmode->yres - mode->yres);
                 if (diff > d) {
                         diff = d;
-                        best = mode;
+                        best = cmode;
                 } else if (diff == d) {
-                        d = abs(mode->refresh - best->refresh);
+                        d = abs(cmode->refresh - mode->refresh);
                         if (diff_refresh > d) {
                                 diff_refresh = d;
-                                best = mode;
+                                best = cmode;
                         }
                 }
         }
@@ -942,6 +944,66 @@ void fb_videomode_to_modelist(struct fb_videomode *modedb, int num,
         }
 }
 
+struct fb_videomode *fb_find_best_display(struct fb_monspecs *specs,
+                                          struct list_head *head)
+{
+        struct list_head *pos;
+        struct fb_modelist *modelist;
+        struct fb_videomode *m, *m1 = NULL, *md = NULL, *best = NULL;
+        int first = 0;
+
+        if (!head->prev || !head->next || list_empty(head))
+                goto finished;
+
+        /* get the first detailed mode and the very first mode */
+        list_for_each(pos, head) {
+                modelist = list_entry(pos, struct fb_modelist, list);
+                m = &modelist->mode;
+
+                if (!first) {
+                        m1 = m;
+                        first = 1;
+                }
+
+                if (m->flag & FB_MODE_IS_FIRST) {
+                        md = m;
+                        break;
+                }
+        }
+
+        /* first detailed timing is preferred */
+        if (specs->misc & FB_MISC_1ST_DETAIL) {
+                best = md;
+                goto finished;
+        }
+
+        /* find best mode based on display width and height */
+        if (specs->max_x && specs->max_y) {
+                struct fb_var_screeninfo var;
+
+                memset(&var, 0, sizeof(struct fb_var_screeninfo));
+                var.xres = (specs->max_x * 7200)/254;
+                var.yres = (specs->max_y * 7200)/254;
+                m = fb_find_best_mode(&var, head);
+                if (m) {
+                        best = m;
+                        goto finished;
+                }
+        }
+
+        /* use first detailed mode */
+        if (md) {
+                best = md;
+                goto finished;
+        }
+
+        /* last resort, use the very first mode */
+        best = m1;
+finished:
+        return best;
+}
+EXPORT_SYMBOL(fb_find_best_display);
+
 EXPORT_SYMBOL(fb_videomode_to_var);
 EXPORT_SYMBOL(fb_var_to_videomode);
 EXPORT_SYMBOL(fb_mode_is_equal);