aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/da8xx-fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/da8xx-fb.c')
-rw-r--r--drivers/video/da8xx-fb.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 52977b14425f..a1f65444b580 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -1329,6 +1329,8 @@ static int fb_probe(struct platform_device *device)
1329 par->panel_power_ctrl(1); 1329 par->panel_power_ctrl(1);
1330 } 1330 }
1331 1331
1332 fb_videomode_to_var(&da8xx_fb_var, lcdc_info);
1333
1332 if (lcd_init(par, lcd_cfg, lcdc_info) < 0) { 1334 if (lcd_init(par, lcd_cfg, lcdc_info) < 0) {
1333 dev_err(&device->dev, "lcd_init failed\n"); 1335 dev_err(&device->dev, "lcd_init failed\n");
1334 ret = -EFAULT; 1336 ret = -EFAULT;
@@ -1381,25 +1383,9 @@ static int fb_probe(struct platform_device *device)
1381 goto err_release_pl_mem; 1383 goto err_release_pl_mem;
1382 } 1384 }
1383 1385
1384 /* Initialize par */
1385 da8xx_fb_info->var.bits_per_pixel = lcd_cfg->bpp;
1386
1387 da8xx_fb_var.xres = lcdc_info->xres;
1388 da8xx_fb_var.xres_virtual = lcdc_info->xres;
1389
1390 da8xx_fb_var.yres = lcdc_info->yres;
1391 da8xx_fb_var.yres_virtual = lcdc_info->yres * LCD_NUM_BUFFERS;
1392
1393 da8xx_fb_var.grayscale = 1386 da8xx_fb_var.grayscale =
1394 lcd_cfg->panel_shade == MONOCHROME ? 1 : 0; 1387 lcd_cfg->panel_shade == MONOCHROME ? 1 : 0;
1395 da8xx_fb_var.bits_per_pixel = lcd_cfg->bpp; 1388 da8xx_fb_var.bits_per_pixel = lcd_cfg->bpp;
1396
1397 da8xx_fb_var.hsync_len = lcdc_info->hsync_len;
1398 da8xx_fb_var.vsync_len = lcdc_info->vsync_len;
1399 da8xx_fb_var.right_margin = lcdc_info->right_margin;
1400 da8xx_fb_var.left_margin = lcdc_info->left_margin;
1401 da8xx_fb_var.lower_margin = lcdc_info->lower_margin;
1402 da8xx_fb_var.upper_margin = lcdc_info->upper_margin;
1403 da8xx_fb_var.pixclock = da8xxfb_pixel_clk_period(par); 1389 da8xx_fb_var.pixclock = da8xxfb_pixel_clk_period(par);
1404 1390
1405 /* Initialize fbinfo */ 1391 /* Initialize fbinfo */