mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 22:53:20 +00:00
Revert "intelfb driver -- use the regular modedb table instead of the VESA"
This reverts 2c47430a03
commit.
This conflicts with a patch in -mm from Antonino reapply later.
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
parent
65eb2f97db
commit
080a416802
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user