/*
- * (C) Gražvydas "notaz" Ignotas, 2010-2011
+ * (C) Gražvydas "notaz" Ignotas, 2010-2012
*
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
* See the COPYING file in the top-level directory.
#include <unistd.h>
#include <linux/fb.h>
-#include "omapsdl.h"
+#include "osdl.h"
#include "omapfb.h"
#include "linux/fbdev.h"
#include "linux/xenv.h"
-struct omapfb_saved_layer {
+struct omapfb_state {
struct omapfb_plane_info pi;
struct omapfb_mem_info mi;
+ struct omapfb_plane_info pi_old;
+ struct omapfb_mem_info mi_old;
};
static const char *get_fb_device(void)
return fbname;
}
-static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h, int mem)
+static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
+ int x, int y, int w, int h, int mem, int *buffer_count)
{
struct omapfb_plane_info pi;
struct omapfb_mem_info mi;
+ int mem_blocks = *buffer_count;
int ret;
memset(&pi, 0, sizeof(pi));
err_perror("SETUP_PLANE");
}
- if (mi.size < mem) {
- mi.size = mem;
- ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
- if (ret != 0) {
+ if (mi.size < mem * mem_blocks) {
+ for (; mem_blocks > 0; mem_blocks--) {
+ mi.size = mem * mem_blocks;
+ ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
+ if (ret == 0)
+ break;
+ }
+ if (ret != 0 || mem_blocks <= 0) {
+ err("failed to allocate at least %d bytes of vram:\n", mem);
err_perror("SETUP_MEM");
return -1;
}
}
+ *buffer_count = mem_blocks;
pi.pos_x = x;
pi.pos_y = y;
return -1;
}
+ ostate->pi = pi;
+ ostate->mi = mi;
return 0;
}
}
static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata,
- const char *fbname, int width, int height, int bpp)
+ const char *fbname, int width, int height, int bpp, int *buffer_count)
{
int x = 0, y = 0, w = width, h = height; /* layer size and pos */
int screen_w = w, screen_h = h;
/* FIXME: assuming layer doesn't change here */
if (pdata->saved_layer == NULL) {
- struct omapfb_saved_layer *slayer;
+ struct omapfb_state *slayer;
slayer = calloc(1, sizeof(*slayer));
if (slayer == NULL)
goto out;
- ret = ioctl(fd, OMAPFB_QUERY_PLANE, &slayer->pi);
+ ret = ioctl(fd, OMAPFB_QUERY_PLANE, &slayer->pi_old);
if (ret != 0) {
err_perror("QUERY_PLANE");
goto out;
}
- ret = ioctl(fd, OMAPFB_QUERY_MEM, &slayer->mi);
+ ret = ioctl(fd, OMAPFB_QUERY_MEM, &slayer->mi_old);
if (ret != 0) {
err_perror("QUERY_MEM");
goto out;
x = screen_w / 2 - w / 2;
y = screen_h / 2 - h / 2;
- ret = osdl_setup_omapfb(fd, 1, x, y, w, h, width * height * ((bpp + 7) / 8) * 2);
+ ret = osdl_setup_omapfb(pdata->saved_layer, fd, 1, x, y, w, h,
+ width * height * ((bpp + 7) / 8), buffer_count);
if (ret == 0) {
pdata->layer_x = x;
pdata->layer_y = y;
void *osdl_video_set_mode(struct SDL_PrivateVideoData *pdata,
int border_l, int border_r, int border_t, int border_b,
- int width, int height, int bpp, int doublebuf)
+ int width, int height, int bpp, int *doublebuf,
+ const char *wm_title)
{
+ int buffers_try, buffers_set;
const char *fbname;
void *result;
int ret;
pdata->fbdev = NULL;
}
- ret = osdl_setup_omap_layer(pdata, fbname, width, height, bpp);
+ buffers_try = buffers_set = 1;
+ if (*doublebuf)
+ /* actually try tripple buffering for reduced chance of tearing */
+ buffers_try = buffers_set = 3;
+
+ ret = osdl_setup_omap_layer(pdata, fbname, width, height, bpp, &buffers_set);
if (ret < 0)
- return NULL;
+ goto fail;
- pdata->fbdev = vout_fbdev_init(fbname, &width, &height, bpp, doublebuf ? 2 : 1);
+ pdata->fbdev = vout_fbdev_init(fbname, &width, &height, bpp, buffers_set);
if (pdata->fbdev == NULL)
- return NULL;
+ goto fail;
if (border_l | border_r | border_t | border_b) {
width -= border_l + border_r;
height -= border_t + border_b;
result = vout_fbdev_resize(pdata->fbdev, width, height, bpp,
- border_l, border_r, border_t, border_b, doublebuf ? 2 : 1);
+ border_l, border_r, border_t, border_b, buffers_set);
}
else {
result = osdl_video_flip(pdata);
}
- if (result == NULL) {
- osdl_video_finish(pdata);
- return NULL;
- }
+ if (result == NULL)
+ goto fail;
if (!pdata->xenv_up) {
- ret = xenv_init();
- if (ret == 0)
+ int xenv_flags = XENV_CAP_KEYS | XENV_CAP_MOUSE;
+ ret = xenv_init(&xenv_flags, wm_title);
+ if (ret == 0) {
pdata->xenv_up = 1;
+ pdata->xenv_mouse = (xenv_flags & XENV_CAP_MOUSE) ? 1 : 0;
+ }
+ }
+
+ if (buffers_try != buffers_set) {
+ log("only %d/%d buffers available, expect tearing\n",
+ buffers_set, buffers_try);
+ *doublebuf = buffers_set > 1;
}
return result;
+
+fail:
+ osdl_video_finish(pdata);
+ return NULL;
}
void *osdl_video_flip(struct SDL_PrivateVideoData *pdata)
return ret;
}
+int osdl_video_pause(struct SDL_PrivateVideoData *pdata, int is_pause)
+{
+ struct omapfb_state *state = pdata->saved_layer;
+ struct omapfb_plane_info pi;
+ struct omapfb_mem_info mi;
+ int enabled;
+ int fd = -1;
+ int ret;
+
+ if (pdata->fbdev != NULL)
+ fd = vout_fbdev_get_fd(pdata->fbdev);
+ if (fd == -1) {
+ err("bad fd %d", fd);
+ return -1;
+ }
+ if (state == NULL) {
+ err("missing layer state\n");
+ return -1;
+ }
+
+ if (is_pause) {
+ ret = vout_fbdev_save(pdata->fbdev);
+ if (ret != 0)
+ return ret;
+ pi = state->pi_old;
+ mi = state->mi_old;
+ enabled = pi.enabled;
+ } else {
+ pi = state->pi;
+ mi = state->mi;
+ enabled = 1;
+ }
+ pi.enabled = 0;
+ ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);
+ if (ret != 0) {
+ err_perror("SETUP_PLANE");
+ return -1;
+ }
+
+ ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
+ if (ret != 0)
+ err_perror("SETUP_MEM");
+
+ if (!is_pause) {
+ ret = vout_fbdev_restore(pdata->fbdev);
+ if (ret != 0) {
+ err("fbdev_restore failed\n");
+ return ret;
+ }
+ }
+
+ if (enabled) {
+ pi.enabled = 1;
+ ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);
+ if (ret != 0) {
+ err_perror("SETUP_PLANE");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
void osdl_video_finish(struct SDL_PrivateVideoData *pdata)
{
static const char *fbname;
/* restore the OMAP layer */
if (pdata->saved_layer != NULL) {
- struct omapfb_saved_layer *slayer = pdata->saved_layer;
+ struct omapfb_state *slayer = pdata->saved_layer;
int fd;
fd = open(fbname, O_RDWR);
if (fd != -1) {
- int enabled = slayer->pi.enabled;
+ int enabled = slayer->pi_old.enabled;
/* be sure to disable while setting up */
- slayer->pi.enabled = 0;
- ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi);
- ioctl(fd, OMAPFB_SETUP_MEM, &slayer->mi);
+ slayer->pi_old.enabled = 0;
+ ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi_old);
+ ioctl(fd, OMAPFB_SETUP_MEM, &slayer->mi_old);
if (enabled) {
- slayer->pi.enabled = enabled;
- ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi);
+ slayer->pi_old.enabled = enabled;
+ ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi_old);
}
close(fd);
}
notaz.gp2x.de / sdl_omap.git / blobdiff