aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia/nvidia.c
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-11-07 04:00:55 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:53 -0500
commit5ee1ef96a0d5c49809c61bdbb30cdda88e1d23cf (patch)
treedbb520ffd6c6ca8e955b1df70e89697e8b5957e7 /drivers/video/nvidia/nvidia.c
parent003cfc0c56977f1c3ce48ddfd2073b7c6d75a5d8 (diff)
[PATCH] fbdev: Convert a few drivers to use the fb_find_best_display helper
Convert i810fb, nvidiafb and savagefb to use the fb_find_best_display helper when searching for the initial video mode. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
-rw-r--r--drivers/video/nvidia/nvidia.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index cbe165bb181d..0b40a2a721c1 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1383,22 +1383,10 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
1383 fb_var_to_videomode(&modedb, &nvidiafb_default_var); 1383 fb_var_to_videomode(&modedb, &nvidiafb_default_var);
1384 1384
1385 if (specs->modedb != NULL) { 1385 if (specs->modedb != NULL) {
1386 /* get preferred timing */ 1386 struct fb_videomode *modedb;
1387 if (specs->misc & FB_MISC_1ST_DETAIL) {
1388 int i;
1389
1390 for (i = 0; i < specs->modedb_len; i++) {
1391 if (specs->modedb[i].flag & FB_MODE_IS_FIRST) {
1392 modedb = specs->modedb[i];
1393 break;
1394 }
1395 }
1396 } else {
1397 /* otherwise, get first mode in database */
1398 modedb = specs->modedb[0];
1399 }
1400 1387
1401 fb_videomode_to_var(&nvidiafb_default_var, &modedb); 1388 modedb = fb_find_best_display(specs, &info->modelist);
1389 fb_videomode_to_var(&nvidiafb_default_var, modedb);
1402 nvidiafb_default_var.bits_per_pixel = 8; 1390 nvidiafb_default_var.bits_per_pixel = 8;
1403 } else if (par->fpWidth && par->fpHeight) { 1391 } else if (par->fpWidth && par->fpHeight) {
1404 char buf[16]; 1392 char buf[16];