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

drm: always check the repaint_status in update_complete

Browse Source 
Initially finish_frame() was never called in drm_output_update_complete() for
'dpms_off_pending = true'. This is wrong for repaint_status ==
REPAINT_AWAITING_COMPLETION and that was fixed in
68d49d772c ("compositor-drm: run finish_frame when
dpms is turned off in update_complete").
However finish_frame() may now be called for repaint_status !=
REPAINT_AWAITING_COMPLETION, which is not allowed and results in a failed
assertion.

Fix this by checking dpms and repaint_status unconditionally.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
This commit is contained in:
Michael Olbrich
2020-08-06 09:57:54 +02:00
parent 5130a8c21a
commit d70e712c2f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-drm/drm.c
+3 -2
View File
@@ -306,8 +306,9 @@ drm_output_update_complete(struct drm_output *output, uint32_t flags,
output->dpms_off_pending = false; output->dpms_off_pending = false;
drm_output_get_disable_state(pending, output); drm_output_get_disable_state(pending, output);
drm_pending_state_apply_sync(pending); drm_pending_state_apply_sync(pending);
} else if (output->state_cur->dpms == WESTON_DPMS_OFF && }
output->base.repaint_status != REPAINT_AWAITING_COMPLETION) { if (output->state_cur->dpms == WESTON_DPMS_OFF &&
output->base.repaint_status != REPAINT_AWAITING_COMPLETION) {
/* DPMS can happen to us either in the middle of a repaint /* DPMS can happen to us either in the middle of a repaint
* cycle (when we have painted fresh content, only to throw it * cycle (when we have painted fresh content, only to throw it
* away for DPMS off), or at any other random point. If the * away for DPMS off), or at any other random point. If the