[PATCH weston v2 2/2] compositor-drm: Watchdog timer implementation

Bryce Harrington bryce at osg.samsung.com
Thu Oct 30 23:04:42 PDT 2014


Just a couple typos spotted

On Thu, Oct 30, 2014 at 01:19:15PM -0400, Frederic Plourde wrote:
>  
> @@ -617,20 +694,24 @@ drm_output_repaint(struct weston_output *output_base,
>  				     output->next->fb_id, 0, 0,
>  				     &output->connector_id, 1,
>  				     &mode->mode_info);
>  		if (ret) {
>  			weston_log("set mode failed: %m\n");
>  			goto err_pageflip;
>  		}
>  		output_base->set_dpms(output_base, WESTON_DPMS_ON);
>  	}
>  
> +	/* Start out watchdog timer */

our

> +	if (output->wdt.timer)
> +		drm_output_watchdog_timer_start(&output->wdt);
> +
>  	if (drmModePageFlip(compositor->drm.fd, output->crtc_id,
>  			    output->next->fb_id,
>  			    DRM_MODE_PAGE_FLIP_EVENT, output) < 0) {
> @@ -704,20 +785,24 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
>  	fb_id = output->current->fb_id;
>  
> +	/* Start out watchdog timer */

our

> +	if (output->wdt.timer)
> +		drm_output_watchdog_timer_start(&output->wdt);
> +
>  	if (drmModePageFlip(compositor->drm.fd, output->crtc_id, fb_id,
>  			    DRM_MODE_PAGE_FLIP_EVENT, output) < 0) {


More information about the wayland-devel mailing list