diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
| commit | cd04b947bc674f8fc9cac38ec30497bae5d664ad (patch) | |
| tree | 988b0b7ea08063e5499672346eb2f619f0629717 /drivers/video/nvidia/nvidia.c | |
| parent | b3df9f813bc7b9db62ae0c90b8990b1cebf97345 (diff) | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
| -rw-r--r-- | drivers/video/nvidia/nvidia.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index b2e6b2407869..52b16850a54e 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
| @@ -1324,6 +1324,13 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info) | |||
| 1324 | 1324 | ||
| 1325 | fb_videomode_to_var(&nvidiafb_default_var, &modedb); | 1325 | fb_videomode_to_var(&nvidiafb_default_var, &modedb); |
| 1326 | nvidiafb_default_var.bits_per_pixel = 8; | 1326 | nvidiafb_default_var.bits_per_pixel = 8; |
| 1327 | } else if (par->fpWidth && par->fpHeight) { | ||
| 1328 | char buf[16]; | ||
| 1329 | |||
| 1330 | memset(buf, 0, 16); | ||
| 1331 | snprintf(buf, 15, "%dx%d", par->fpWidth, par->fpHeight); | ||
| 1332 | fb_find_mode(&nvidiafb_default_var, info, buf, specs->modedb, | ||
| 1333 | specs->modedb_len, &modedb, 8); | ||
| 1327 | } | 1334 | } |
| 1328 | 1335 | ||
| 1329 | if (mode_option) | 1336 | if (mode_option) |