diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-15 23:12:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-20 07:11:21 +0200 |
| commit | 772ab4f1722c5d166fe0677aa779e7b8628f0a79 (patch) | |
| tree | 5b566fa8a0e1222c195acc86e3b350840a270255 /drivers/video | |
| parent | 8a4be8093637445b358c72149a3fd40d47116ba5 (diff) | |
| download | barebox-772ab4f1722c5d166fe0677aa779e7b8628f0a79.tar.gz barebox-772ab4f1722c5d166fe0677aa779e7b8628f0a79.tar.xz | |
fb: sdl: create graphics window on enabling
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sdl.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/video/sdl.c b/drivers/video/sdl.c index a56834004c..5e1dc8e579 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(); |