[PATCH] libweston/compositor: Place timeline recording after checking if stamp is valid

[Pekka Paalanen]

On Tue,  6 Mar 2018 18:56:23 +0200
Marius Vlad <marius-cristian.vlad at nxp.com> wrote:

> The timestamp could be either NULL if there's no mode set, or 0 when output gets
> awaken. It either crashes weston or we get vblanks at [0, 0] for that output.
> 
> Signed-off-by: Marius Vlad <marius-cristian.vlad at nxp.com>
> CC: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> ---
>  libweston/compositor.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libweston/compositor.c b/libweston/compositor.c
> index aec937b..274a22d 100644
> --- a/libweston/compositor.c
> +++ b/libweston/compositor.c
> @@ -2495,8 +2495,6 @@ weston_output_finish_frame(struct weston_output *output,
>  	struct timespec now;
>  	int64_t msec_rel;
>  
> -	TL_POINT("core_repaint_finished", TLP_OUTPUT(output),
> -		 TLP_VBLANK(stamp), TLP_END);
>  
>  	assert(output->repaint_status == REPAINT_AWAITING_COMPLETION);
>  	assert(stamp || (presented_flags & WP_PRESENTATION_FEEDBACK_INVALID));
> @@ -2511,6 +2509,9 @@ weston_output_finish_frame(struct weston_output *output,
>  		goto out;
>  	}
>  
> +	TL_POINT("core_repaint_finished", TLP_OUTPUT(output),
> +		 TLP_VBLANK(stamp), TLP_END);
> +
>  	refresh_nsec = millihz_to_nsec(output->current_mode->refresh);
>  	weston_presentation_feedback_present_list(&output->feedback_list,
>  						  output, refresh_nsec, stamp,

Hi,

yup, a good crasher fix, and it also goes well with what I recall
"core_repaint_finished" meaning. I don't recall what wesgr expects of
this though, since most start_repaint_loop implementations actually
pass in the current time, not zeroes.

Anyway, pushed:
   d1510b4f..df9278ae  master -> master


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20180315/79f59eb4/attachment.sig>