From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/4 v2] video stm/mx2x: allow to pass in fb memory from platform data
Date: Mon, 17 Jan 2011 18:56:23 +0100 [thread overview]
Message-ID: <20110117175623.GL9041@pengutronix.de> (raw)
In-Reply-To: <1295259766-19301-3-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
v2: do not forget to set the framebuffer to zero in case of platform
provided fb address
arch/arm/mach-stm/include/mach/fb.h | 3 +++
drivers/video/stm.c | 16 ++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-stm/include/mach/fb.h b/arch/arm/mach-stm/include/mach/fb.h
index 65e3be2..2eade76 100644
--- a/arch/arm/mach-stm/include/mach/fb.h
+++ b/arch/arm/mach-stm/include/mach/fb.h
@@ -37,6 +37,9 @@ struct imx_fb_videomode {
unsigned dotclk_delay; /**< refer manual HW_LCDIF_VDCTRL4 register */
unsigned ld_intf_width; /**< refer STMLCDIF_* macros */
+
+ void *fixed_screen; /**< if != NULL use this as framebuffer memory */
+ unsigned fixed_screen_size; /**< framebuffer memory size for fixed_screen */
};
#endif /* __MACH_FB_H */
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index ecf450c..3ccb309 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -298,11 +298,19 @@ static int stmfb_activate_var(struct fb_info *fb_info)
size = calc_line_length(mode->xres, fb_info->bits_per_pixel) *
mode->yres;
- fb_info->screen_base = realloc(fb_info->screen_base, size);
- if (!fb_info->screen_base)
- return -ENOMEM;
+ if (pdata->fixed_screen) {
+ if (pdata->fixed_screen_size < size)
+ return -ENOMEM;
+ fb_info->screen_base = pdata->fixed_screen;
+ fbi->memory_size = pdata->fixed_screen_size;
+ } else {
+ fb_info->screen_base = realloc(fb_info->screen_base, size);
+ if (!fb_info->screen_base)
+ return -ENOMEM;
+ fbi->memory_size = size;
+ }
+
memset(fb_info->screen_base, 0, size);
- fbi->memory_size = size;
/** @todo ensure HCLK is active at this point of time! */
--
1.7.2.3
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-01-17 17:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-17 10:22 i.MX28 patches v2 Sascha Hauer
2011-01-17 10:22 ` [PATCH 1/4] video stm/mx2x: simplify memory allocation Sascha Hauer
2011-01-17 10:22 ` [PATCH 2/4] video stm/mx2x: allow to pass in fb memory from platform data Sascha Hauer
2011-01-17 17:56 ` Sascha Hauer [this message]
2011-01-17 10:22 ` [PATCH 3/4] ARM i.MX28 tx28: use a fixed framebuffer address Sascha Hauer
2011-01-17 10:59 ` Juergen Beisert
2011-01-17 22:49 ` Marc Reilly
2011-01-18 7:48 ` Peter Korsgaard
2011-01-18 9:41 ` Juergen Beisert
2011-01-17 10:22 ` [PATCH 4/4] ARM i.MX28 tx28 defconfig: enable MMU Sascha Hauer
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=20110117175623.GL9041@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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