linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH 8/8] OMAP: DSS2: OMAPFB: Reduce stack usage
Date: Tue, 10 May 2011 16:24:16 +0000	[thread overview]
Message-ID: <1305044656-31512-9-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1305044656-31512-1-git-send-email-tomi.valkeinen@ti.com>

omapfb_mode_to_timings() had struct fb_info, struct fb_var and struct
fb_ops allocated from stack. This caused the stack usage grow quite
high.

Use kzalloc to allocate the structs instead.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/video/omap2/omapfb/omapfb-main.c |   49 +++++++++++++++++-------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 30c958b..ae3e2be 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1996,9 +1996,9 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
 static int omapfb_mode_to_timings(const char *mode_str,
 		struct omap_video_timings *timings, u8 *bpp)
 {
-	struct fb_info fbi;
-	struct fb_var_screeninfo var;
-	struct fb_ops fbops;
+	struct fb_info *fbi;
+	struct fb_var_screeninfo *var;
+	struct fb_ops *fbops;
 	int r;
 
 #ifdef CONFIG_OMAP2_DSS_VENC
@@ -2016,25 +2016,25 @@ static int omapfb_mode_to_timings(const char *mode_str,
 	/* this is quite a hack, but I wanted to use the modedb and for
 	 * that we need fb_info and var, so we create dummy ones */
 
-	memset(&fbi, 0, sizeof(fbi));
-	memset(&var, 0, sizeof(var));
-	memset(&fbops, 0, sizeof(fbops));
-	fbi.fbops = &fbops;
+	fbi = kzalloc(sizeof(*fbi), GFP_KERNEL);
+	var = kzalloc(sizeof(*var), GFP_KERNEL);
+	fbops = kzalloc(sizeof(*fbops), GFP_KERNEL);
+	fbi->fbops = fbops;
 
-	r = fb_find_mode(&var, &fbi, mode_str, NULL, 0, NULL, 24);
+	r = fb_find_mode(var, fbi, mode_str, NULL, 0, NULL, 24);
 
 	if (r != 0) {
-		timings->pixel_clock = PICOS2KHZ(var.pixclock);
-		timings->hbp = var.left_margin;
-		timings->hfp = var.right_margin;
-		timings->vbp = var.upper_margin;
-		timings->vfp = var.lower_margin;
-		timings->hsw = var.hsync_len;
-		timings->vsw = var.vsync_len;
-		timings->x_res = var.xres;
-		timings->y_res = var.yres;
-
-		switch (var.bits_per_pixel) {
+		timings->pixel_clock = PICOS2KHZ(var->pixclock);
+		timings->hbp = var->left_margin;
+		timings->hfp = var->right_margin;
+		timings->vbp = var->upper_margin;
+		timings->vfp = var->lower_margin;
+		timings->hsw = var->hsync_len;
+		timings->vsw = var->vsync_len;
+		timings->x_res = var->xres;
+		timings->y_res = var->yres;
+
+		switch (var->bits_per_pixel) {
 		case 16:
 			*bpp = 16;
 			break;
@@ -2045,10 +2045,17 @@ static int omapfb_mode_to_timings(const char *mode_str,
 			break;
 		}
 
-		return 0;
+		r = 0;
 	} else {
-		return -EINVAL;
+		*bpp = 0;
+		r = -EINVAL;
 	}
+
+	kfree(fbi);
+	kfree(var);
+	kfree(fbops);
+
+	return r;
 }
 
 static int omapfb_set_def_mode(struct omapfb2_device *fbdev,
-- 
1.7.4.1


  parent reply	other threads:[~2011-05-10 16:24 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-10 16:24 [PATCH 0/8] OMAP: DSS2: Miscellaneous patches Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 1/8] OMAP: DSS2: Add missing dummy functions Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 2/8] OMAPFB: fix wrong clock aliases and device name Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 3/8] OMAP: DSS2: RFBI: add rfbi_bus_lock Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 4/8] OMAP: DSS2: RFIB: clock enable/disable changes Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 5/8] OMAP: DSS2: RFBI: add omap_rfbi_configure Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 6/8] OMAP: DSS2: RFIB: cleanup Tomi Valkeinen
2011-05-10 16:24 ` [PATCH 7/8] OMAP: DSS2: OMAPFB: remove dead code Tomi Valkeinen
2011-05-10 16:24 ` Tomi Valkeinen [this message]
2011-05-10 19:08   ` [PATCH 8/8] OMAP: DSS2: OMAPFB: Reduce stack usage aaro.koskinen
2011-05-11  6:11     ` Tomi Valkeinen
2011-05-11  3:50   ` Janorkar, Mayuresh
2011-05-11  3:57 ` [PATCH 0/8] OMAP: DSS2: Miscellaneous patches Janorkar, Mayuresh
2011-05-11  6:12   ` Tomi Valkeinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1305044656-31512-9-git-send-email-tomi.valkeinen@ti.com \
    --to=tomi.valkeinen@ti.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).