Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71d3b0fc authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

fbdev: sh_mobile_lcdcfb: allocate memory, sufficient for the biggest mode 



Now, that we add support for multiple modes to the sh_mobile_lcdcfb driver, it
has to allocate memory, sufficient for the biggest of them.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent baf16374

drivers/video/sh_mobile_lcdcfb.c

+20 −6
Original line number Original line Diff line number Diff line
@@ -1103,8 +1103,10 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 




	for (i = 0; i < j; i++) {

	for (i = 0; i < j; i++) {

		struct fb_var_screeninfo *var;

		struct fb_var_screeninfo *var;

		const struct fb_videomode *lcd_cfg;

		const struct fb_videomode *lcd_cfg, *max_cfg = NULL;

		struct sh_mobile_lcdc_chan *ch = priv->ch + i;

		struct sh_mobile_lcdc_chan *ch = priv->ch + i;

		unsigned long max_size = 0;

		int k;





		cfg = &ch->cfg;

		cfg = &ch->cfg;
@@ -1117,9 +1119,8 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 




		info = ch->info;

		info = ch->info;

		var = &info->var;

		var = &info->var;

		lcd_cfg = &cfg->lcd_cfg[0];

		info->fbops = &sh_mobile_lcdc_ops;

		info->fbops = &sh_mobile_lcdc_ops;

		fb_videomode_to_var(var, lcd_cfg);

		fb_videomode_to_var(var, &cfg->lcd_cfg[0]);

		/* Default Y virtual resolution is 2x panel size */

		/* Default Y virtual resolution is 2x panel size */

		var->yres_virtual = var->yres * 2;

		var->yres_virtual = var->yres * 2;
@@ -1127,10 +1128,23 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 
		if (error)

		if (error)

			break;

			break;





		for (k = 0, lcd_cfg = cfg->lcd_cfg;

		     k < cfg->num_cfg;

		     k++, lcd_cfg++) {

			unsigned long size = lcd_cfg->yres * lcd_cfg->xres;



			if (size > max_size) {

				max_cfg = lcd_cfg;

				max_size = size;

			}

		}



		dev_dbg(&pdev->dev, "Found largest videomode %ux%u\n",

			max_cfg->xres, max_cfg->yres);



		info->fix = sh_mobile_lcdc_fix;

		info->fix = sh_mobile_lcdc_fix;

		info->fix.line_length = lcd_cfg->xres * (cfg->bpp / 8);

		info->fix.line_length = cfg->lcd_cfg[0].xres * (cfg->bpp / 8);

		info->fix.smem_len = info->fix.line_length *

		info->fix.smem_len = max_size * (cfg->bpp / 8) * 2;

			var->yres_virtual;





		buf = dma_alloc_coherent(&pdev->dev, info->fix.smem_len,

		buf = dma_alloc_coherent(&pdev->dev, info->fix.smem_len,

					 &ch->dma_handle, GFP_KERNEL);

					 &ch->dma_handle, GFP_KERNEL);