Skip to content

Commit

Permalink
Revert "intelfb driver -- use the regular modedb table instead of the…
Browse files Browse the repository at this point in the history
… VESA"

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

Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Dave Airlie committed May 29, 2006
1 parent 65eb2f9 commit 080a416
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/video/intelfb/intelfbdrv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 080a416

Please sign in to comment.