GitLab will be down for maintenance this Sunday 13th June, from approx 7-11am UTC. This is for a PostgreSQL migration. See the tracker issue for more informations.

Commit 3dc838f7 authored by Hans de Goede's avatar Hans de Goede
Browse files

modesetting: Improve page-flip error reporting

Before this commit ms_do_pageflip logged a single error for both the
drmmode_bo_import failure path as well as for the queue_flip_on_crtc
path. This commit splits this into 2 separate error logs so that it is
clear what the cause of the flip-failure is.
Reviewed-by: Michel Dänzer's avatarMichel Dänzer <>
Signed-off-by: default avatarHans de Goede <>
parent 12821852
......@@ -284,8 +284,11 @@ ms_do_pageflip(ScreenPtr screen,
new_front_bo.width = new_front->drawable.width;
new_front_bo.height = new_front->drawable.height;
if (drmmode_bo_import(&ms->drmmode, &new_front_bo,
&ms->drmmode.fb_id)) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING, "%s: Import BO failed: %s\n",
log_prefix, strerror(errno));
goto error_out;
if (async)
......@@ -309,6 +312,9 @@ ms_do_pageflip(ScreenPtr screen,
if (!queue_flip_on_crtc(screen, crtc, flipdata,
flags)) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"%s: Queue flip on CRTC %d failed: %s\n",
log_prefix, i, strerror(errno));
goto error_undo;
......@@ -338,8 +344,6 @@ error_undo:
xf86DrvMsg(scrn->scrnIndex, X_WARNING, "%s: Page flip failed: %s\n",
log_prefix, strerror(errno));
drmmode_bo_destroy(&ms->drmmode, &new_front_bo);
/* if only the local reference - free the structure,
* else drop the local reference and return */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment