From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 10/12] fb: sdl: create graphics window on enabling
Date: Thu, 16 Jul 2015 09:31:50 +0200 [thread overview]
Message-ID: <1437031912-24754-11-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1437031912-24754-1-git-send-email-s.hauer@pengutronix.de>
The framebuffer should be enabled on the fb_enable callback and disabled
in the fb_disable callback. In SDL context this means the grapics window
has to be created / destroyed in fb_enable / fb_disable.
With this change the framebuffer has to be enabled explicitly with
fb0.enable=1 like with other framebuffer driver aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/video/sdl.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/video/sdl.c b/drivers/video/sdl.c
index a568340..5e1dc8e 100644
--- a/drivers/video/sdl.c
+++ b/drivers/video/sdl.c
@@ -15,12 +15,21 @@
static void sdlfb_enable(struct fb_info *info)
{
+ int ret;
+
+ ret = sdl_open(info->xres, info->yres, info->bits_per_pixel,
+ info->screen_base);
+ if (ret)
+ return;
+ sdl_get_bitfield_rgba(&info->red, &info->green, &info->blue, &info->transp);
+
sdl_start_timer();
}
static void sdlfb_disable(struct fb_info *info)
{
sdl_stop_timer();
+ sdl_close();
}
static struct fb_ops sdlfb_ops = {
@@ -50,12 +59,6 @@ static int sdlfb_probe(struct device_d *dev)
fb->screen_base = xzalloc(fb->xres * fb->yres *
fb->bits_per_pixel >> 3);
- if (sdl_open(fb->xres, fb->yres, fb->bits_per_pixel,
- fb->screen_base))
- goto err;
-
- sdl_get_bitfield_rgba(&fb->red, &fb->green, &fb->blue, &fb->transp);
-
dev_dbg(dev, "red: length = %d, offset = %d\n",
fb->red.length, fb->red.offset);
dev_dbg(dev, "green: length = %d, offset = %d\n",
@@ -72,7 +75,6 @@ static int sdlfb_probe(struct device_d *dev)
if (!ret)
return 0;
-err:
kfree(fb->screen_base);
kfree(fb);
sdl_close();
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-07-16 7:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 7:31 Framebuffer console patches Sascha Hauer
2015-07-16 7:31 ` [PATCH 01/12] graphic_utils: Add a common namespace to functions Sascha Hauer
2015-07-16 7:31 ` [PATCH 02/12] gui: Fix typo in function name Sascha Hauer
2015-07-16 7:31 ` [PATCH 03/12] graphics_utils: Add function to invert an area Sascha Hauer
2015-07-16 7:31 ` [PATCH 04/12] graphics_utils: Export get_pixel Sascha Hauer
2015-07-16 7:31 ` [PATCH 05/12] graphics_utils: add function to create pixel from rgb triplet Sascha Hauer
2015-07-16 7:31 ` [PATCH 06/12] import lib/fonts framework from linux kernel Sascha Hauer
2015-07-16 7:31 ` [PATCH 07/12] lib/fonts: add "MINI4x6" font Sascha Hauer
2015-07-16 7:31 ` [PATCH 08/12] fonts: Add 7x14 font Sascha Hauer
2015-07-16 7:31 ` [PATCH 09/12] fb: Add fb_enable/disable functions Sascha Hauer
2015-07-16 7:31 ` Sascha Hauer [this message]
2015-07-16 7:31 ` [PATCH 11/12] graphics_utils: Let fb_open allocate the screen Sascha Hauer
2015-07-16 7:31 ` [PATCH 12/12] video: implement framebuffer console Sascha Hauer
2015-07-16 8:36 ` 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=1437031912-24754-11-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