1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 08d072552233..640351c9a9e1 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -522,7 +522,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
         int res_specified = 0, bpp_specified = 0, refresh_specified = 0;
         unsigned int xres = 0, yres = 0, bpp = default_bpp, refresh = 0;
         int yres_specified = 0, cvt = 0, rb = 0, interlace = 0, margins = 0;
-        u32 best, diff;
+        u32 best, diff, tdiff;
 
         for (i = namelen-1; i >= 0; i--) {
             switch (name[i]) {
@@ -651,19 +651,27 @@ done:
                 return (refresh_specified) ? 2 : 1;
         }
 
-        diff = xres + yres;
+        diff = 2 * (xres + yres);
         best = -1;
         DPRINTK("Trying best-fit modes\n");
         for (i = 0; i < dbsize; i++) {
-            if (xres <= db[i].xres && yres <= db[i].yres) {
                 DPRINTK("Trying %ix%i\n", db[i].xres, db[i].yres);
                 if (!fb_try_mode(var, info, &db[i], bpp)) {
-                    if (diff > (db[i].xres - xres) + (db[i].yres - yres)) {
-                        diff = (db[i].xres - xres) + (db[i].yres - yres);
-                        best = i;
-                    }
+                        tdiff = abs(db[i].xres - xres) +
+                                abs(db[i].yres - yres);
+
+                        /*
+                         * Penalize modes with resolutions smaller
+                         * than requested.
+                         */
+                        if (xres > db[i].xres || yres > db[i].yres)
+                                tdiff += xres + yres;
+
+                        if (diff > tdiff) {
+                                diff = tdiff;
+                                best = i;
+                        }
                 }
-            }
         }
         if (best != -1) {
             fb_try_mode(var, info, &db[best], bpp);