aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-12-21 05:46:26 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-12-22 02:28:26 -0500
commite0b9fb26266778cc749365b98041c5b7ef6f10f8 (patch)
tree2650746cd37a951e8bea07bb57a2a00a299602f5 /drivers/video
parent90a8a73c06cc32b609a880d48449d7083327e11a (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sh_mobile_lcdcfb.c4
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)
1238 mode = &default_720p; 1238 mode = &default_720p;
1239 num_cfg = 1; 1239 num_cfg = 1;
1240 } else { 1240 } else {
1241 num_cfg = ch->cfg.num_cfg; 1241 num_cfg = cfg->num_cfg;
1242 } 1242 }
1243 1243
1244 fb_videomode_to_modelist(mode, num_cfg, &info->modelist); 1244 fb_videomode_to_modelist(mode, num_cfg, &info->modelist);
1245 1245
1246 fb_videomode_to_var(var, mode); 1246 fb_videomode_to_var(var, mode);
1247 var->width = cfg->lcd_size_cfg.width;
1248 var->height = cfg->lcd_size_cfg.height;
1247 /* Default Y virtual resolution is 2x panel size */ 1249 /* Default Y virtual resolution is 2x panel size */
1248 var->yres_virtual = var->yres * 2; 1250 var->yres_virtual = var->yres * 2;
1249 var->activate = FB_ACTIVATE_NOW; 1251 var->activate = FB_ACTIVATE_NOW;