mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: finish frame if initial page-flip fails

Browse Source 
If the initial page-flip fails, immediately finish the frame to avoid
being stuck in the given frame. We already do this if we have no fbo
available. Now we do the same if the page-flip fails.
This commit is contained in:
David Herrmann
2013-10-22 17:11:25 +02:00
committed by Kristian Høgsberg
parent 4c4bb953fc
commit 3c688c5e33
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+11 -8
View File
@@ -674,7 +674,7 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
struct drm_compositor *compositor = (struct drm_compositor *)
output_base->compositor;
uint32_t fb_id;
uint32_t msec;
struct timespec ts;
if (output->destroy_pending)
@@ -682,12 +682,7 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
if (!output->current) {
/* We can't page flip if there's no mode set */
uint32_t msec;
clock_gettime(compositor->clock, &ts);
msec = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
weston_output_finish_frame(output_base, msec);
return;
goto finish_frame;
}
fb_id = output->current->fb_id;
@@ -695,8 +690,16 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
if (drmModePageFlip(compositor->drm.fd, output->crtc_id, fb_id,
DRM_MODE_PAGE_FLIP_EVENT, output) < 0) {
weston_log("queueing pageflip failed: %m\n");
return;
goto finish_frame;
}
return;
finish_frame:
/* if we cannot page-flip, immediately finish frame */
clock_gettime(compositor->clock, &ts);
msec = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
weston_output_finish_frame(output_base, msec);
}
static void