From: Dave Airlie <airlied@linux.ie>
Date: Mon, 29 May 2006 08:45:19 +0000 (+1000)
Subject: Revert "intelfb driver -- use the regular modedb table instead of the VESA"
X-Git-Tag: v2.6.18-rc1~1112^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080a416802153dbbb20ab4f4fa1225867096d071;p=linux-2.6

Revert "intelfb driver -- use the regular modedb table instead of the VESA"

This reverts 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 commit.
This conflicts with a patch in -mm from Antonino reapply later.

Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e302d2b742..65059ba320 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1033,13 +1033,15 @@ intelfb_init_var(struct intelfb_info *dinfo)
 	} else {
 		if (mode) {
 			msrc = fb_find_mode(var, dinfo->info, mode,
-					    NULL, 0, NULL, 0);
+					    vesa_modes, VESA_MODEDB_SIZE,
+					    NULL, 0);
 			if (msrc)
 				msrc |= 8;
 		}
 		if (!msrc) {
 			msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE,
-					    NULL, 0, NULL, 0);
+					    vesa_modes, VESA_MODEDB_SIZE,
+					    NULL, 0);
 		}
 	}