diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-12-21 11:46:26 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 08:28:26 +0100 |
| commit | e0b9fb26266778cc749365b98041c5b7ef6f10f8 (patch) | |
| tree | 2650746cd37a951e8bea07bb57a2a00a299602f5 | |
| parent | Linux 2.6.37-rc7 (diff) | |
| download | linux-e0b9fb26266778cc749365b98041c5b7ef6f10f8.tar.xz linux-e0b9fb26266778cc749365b98041c5b7ef6f10f8.zip | |
fbdev: sh-mobile: restore display size configuration
An earlier patch replaced open-coded video-mode configuration from
platform data by a call to fb_videomode_to_var(), thereby setting
ofdisplay sizes have been accidentally lost. Restore them.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index b02d97a879d6..257ed0c4b203 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -1238,12 +1238,14 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) mode = &default_720p; num_cfg = 1; } else { - num_cfg = ch->cfg.num_cfg; + num_cfg = cfg->num_cfg; } fb_videomode_to_modelist(mode, num_cfg, &info->modelist); fb_videomode_to_var(var, mode); + var->width = cfg->lcd_size_cfg.width; + var->height = cfg->lcd_size_cfg.height; /* Default Y virtual resolution is 2x panel size */ var->yres_virtual = var->yres * 2; var->activate = FB_ACTIVATE_NOW; |