On startup, we cannot lock on to the repaint timer because it is unknown
to us. We deal with this by claiming that the moment of entry into the
repaint loop is the moment a frame returned, causing finish_frame to
delay our initial repaint to (refresh_time - repaint_delay), typically
around 9ms of utterly wasted time.

Add an explicit stamp == NULL, to determine that we are just beginning
our repaint loop, that the timings are in fact totally invalid, and that
it would be beneficial to repaint the output immediately.

Signed-off-by: Daniel Stone <[email protected]>
---
 libweston/compositor-drm.c | 3 +--
 libweston/compositor.c     | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 7376b3e5b..aeaba83fa 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -862,8 +862,7 @@ drm_output_start_repaint_loop(struct weston_output 
*output_base)
 
 finish_frame:
        /* if we cannot page-flip, immediately finish frame */
-       weston_compositor_read_presentation_clock(output_base->compositor, &ts);
-       weston_output_finish_frame(output_base, &ts,
+       weston_output_finish_frame(output_base, NULL,
                                   WP_PRESENTATION_FEEDBACK_INVALID);
 }
 
diff --git a/libweston/compositor.c b/libweston/compositor.c
index 9eab0e298..ed8ef90fd 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -2383,6 +2383,12 @@ weston_output_finish_frame(struct weston_output *output,
        TL_POINT("core_repaint_finished", TLP_OUTPUT(output),
                 TLP_VBLANK(stamp), TLP_END);
 
+       /* If we haven't been supplied any timestamp at all, we don't have a
+        * timebase to work against, so any delay just wastes time. Push a
+        * repaint as soon as possible so we can get on with it. */
+       if (!stamp)
+               goto out;
+
        refresh_nsec = millihz_to_nsec(output->current_mode->refresh);
        weston_presentation_feedback_present_list(&output->feedback_list,
                                                  output, refresh_nsec, stamp,
@@ -2415,6 +2421,7 @@ weston_output_finish_frame(struct weston_output *output,
        if (presented_flags == WP_PRESENTATION_FEEDBACK_INVALID && msec_rel < 0)
                msec_rel += refresh_nsec / 1000000;
 
+out:
        if (msec_rel < 1)
                output_repaint_timer_handler(output);
        else
-- 
2.11.0

_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to