timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore-x: vsync_animator_tick_source_set fail if drmWaitVBlank fails

This commit is contained in:
Carsten Haitzler 2013-07-16 19:39:10 +09:00
parent 0d83feaa79
commit 604fac4166
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/ecore_x/xlib/ecore_x_vsync.c
View File

@ -117,7 +117,7 @@ static void *drm_lib = NULL;
static Window dri_drm_vsync_root = 0; static Window dri_drm_vsync_root = 0;
static void static Eina_Bool
_dri_drm_tick_schedule(void) _dri_drm_tick_schedule(void)
{ {
drmVBlank vbl; drmVBlank vbl;
@ -125,7 +125,8 @@ _dri_drm_tick_schedule(void)
vbl.request.type = DRM_VBLANK_RELATIVE | DRM_VBLANK_EVENT; vbl.request.type = DRM_VBLANK_RELATIVE | DRM_VBLANK_EVENT;
vbl.request.sequence = drm_animators_interval; vbl.request.sequence = drm_animators_interval;
vbl.request.signal = 0; vbl.request.signal = 0;
sym_drmWaitVBlank(drm_fd, &vbl); if (sym_drmWaitVBlank(drm_fd, &vbl) < 0) return EINA_FALSE;
return EINA_TRUE;
} }
static void static void
@ -148,8 +149,11 @@ _dri_drm_vblank_handler(int fd EINA_UNUSED,
unsigned int usec EINA_UNUSED, unsigned int usec EINA_UNUSED,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
ecore_animator_custom_tick(); if (drm_event_is_busy)
if (drm_event_is_busy) _dri_drm_tick_schedule(); {
ecore_animator_custom_tick();
_dri_drm_tick_schedule();
}
} }
static Eina_Bool static Eina_Bool
@ -271,6 +275,13 @@ _dri_drm_init(void)
drm_evctx.vblank_handler = _dri_drm_vblank_handler; drm_evctx.vblank_handler = _dri_drm_vblank_handler;
drm_evctx.page_flip_handler = NULL; drm_evctx.page_flip_handler = NULL;
if (!_dri_drm_tick_schedule())
{
close(drm_fd);
drm_fd = -1;
return 0;
}
dri_drm_fdh = ecore_main_fd_handler_add(drm_fd, ECORE_FD_READ, dri_drm_fdh = ecore_main_fd_handler_add(drm_fd, ECORE_FD_READ,
_dri_drm_cb, NULL, NULL, NULL); _dri_drm_cb, NULL, NULL, NULL);
if (!dri_drm_fdh) if (!dri_drm_fdh)