From patchwork Fri Sep 3 07:20:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 152451 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o837Jie4012912 for ; Fri, 3 Sep 2010 07:20:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754927Ab0ICHUL (ORCPT ); Fri, 3 Sep 2010 03:20:11 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:39220 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1754954Ab0ICHUK (ORCPT ); Fri, 3 Sep 2010 03:20:10 -0400 Received: (qmail invoked by alias); 03 Sep 2010 07:20:08 -0000 Received: from p50898987.dip0.t-ipconnect.de (EHLO axis700.grange) [80.137.137.135] by mail.gmx.net (mp064) with SMTP; 03 Sep 2010 09:20:08 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1+1t2g/p9O1I6JQLUKfKfnebhKZTOTw1lma6cKS+e 7XqqtGgFfCX6nD Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OrQZI-0000vT-Hm; Fri, 03 Sep 2010 09:20:12 +0200 Date: Fri, 3 Sep 2010 09:20:12 +0200 (CEST) From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org cc: linux-fbdev@vger.kernel.org Subject: [PATCH 07/15] fbdev: sh_mobile_lcdcfb: allocate memory, sufficient for the biggest mode In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Sep 2010 07:20:12 +0000 (UTC) diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 2f6e37e..ddd6c46 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -1103,8 +1103,10 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) for (i = 0; i < j; i++) { 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; + unsigned long max_size = 0; + int k; cfg = &ch->cfg; @@ -1117,9 +1119,8 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) info = ch->info; var = &info->var; - lcd_cfg = &cfg->lcd_cfg[0]; 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 */ var->yres_virtual = var->yres * 2; @@ -1127,10 +1128,23 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) if (error) 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.line_length = lcd_cfg->xres * (cfg->bpp / 8); - info->fix.smem_len = info->fix.line_length * - var->yres_virtual; + info->fix.line_length = cfg->lcd_cfg[0].xres * (cfg->bpp / 8); + info->fix.smem_len = max_size * (cfg->bpp / 8) * 2; buf = dma_alloc_coherent(&pdev->dev, info->fix.smem_len, &ch->dma_handle, GFP_KERNEL);