Commit 080a4168 authored by Dave Airlie's avatar Dave Airlie

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

This reverts 2c47430a commit.
This conflicts with a patch in -mm from Antonino reapply later.
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 65eb2f97
......@@ -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);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment