From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/7] video stm/mx2x: simplify memory allocation
Date: Fri, 14 Jan 2011 20:51:35 +0100 [thread overview]
Message-ID: <1295034699-18863-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1295034699-18863-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/video/stm.c | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index f0abe4c..d2add41 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -209,24 +209,6 @@ static inline unsigned calc_line_length(unsigned ppl, unsigned bpp)
return (ppl * bpp) >> 3;
}
-static int stmfb_memory_mmgt(struct fb_info *fb_info, unsigned size)
-{
- struct imxfb_info *fbi = fb_info->priv;
-
- if (fbi->memory_size != 0) {
- free(fb_info->screen_base);
- fb_info->screen_base = NULL;
- fbi->memory_size = 0;
- }
-
- if (fbi->memory_size == 0) {
- fb_info->screen_base = xzalloc(size);
- fbi->memory_size = size;
- }
-
- return 0;
-}
-
static void stmfb_enable_controller(struct fb_info *fb_info)
{
struct imxfb_info *fbi = fb_info->priv;
@@ -308,7 +290,6 @@ static int stmfb_activate_var(struct fb_info *fb_info)
struct imx_fb_videomode *pdata = fbi->pdata;
struct fb_videomode *mode = fb_info->mode;
uint32_t reg;
- int ret;
unsigned size;
/*
@@ -317,11 +298,8 @@ static int stmfb_activate_var(struct fb_info *fb_info)
size = calc_line_length(mode->xres, fb_info->bits_per_pixel) *
mode->yres;
- ret = stmfb_memory_mmgt(fb_info, size);
- if (ret != 0) {
- dev_err(fbi->hw_dev, "Cannot allocate framebuffer memory\n");
- return ret;
- }
+ fb_info->screen_base = xrealloc(fb_info->screen_base, size);
+ fbi->memory_size = size;
/** @todo ensure HCLK is active at this point of time! */
--
1.7.2.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-01-14 19:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-14 19:51 some i.MX28 related patches Sascha Hauer
2011-01-14 19:51 ` [PATCH 1/7] fec i.MX28: Make it work with MMU on Sascha Hauer
2011-01-14 19:51 ` [PATCH 2/7] ARM tx28: Add mmu support Sascha Hauer
2011-01-14 19:51 ` Sascha Hauer [this message]
2011-01-15 15:00 ` [PATCH 3/7] video stm/mx2x: simplify memory allocation Juergen Beisert
2011-01-15 15:10 ` Sascha Hauer
2011-01-14 19:51 ` [PATCH 4/7] video stm/mx2x: allow to pass in fb memory from platform data Sascha Hauer
2011-01-15 15:04 ` Juergen Beisert
2011-01-14 19:51 ` [PATCH 5/7] provide real barebox end variable Sascha Hauer
2011-01-15 1:50 ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-15 14:48 ` Sascha Hauer
2011-01-14 19:51 ` [PATCH 6/7] ARM i.MX28 tx28: use a fixed framebuffer address Sascha Hauer
2011-01-14 19:51 ` [PATCH 7/7] 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=1295034699-18863-4-git-send-email-s.hauer@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