[PATCH v15 06/34] compositor-drm: Don't restore original CRTC mode

[Pekka Paalanen]

On Mon,  5 Feb 2018 18:44:15 +0000
Daniel Stone <daniels at collabora.com> wrote:

> When leaving Weston, don't attempt to restore the previous CRTC
> settings. The framebuffer may well have disappeared, and in every
> likelihood, whoever gets the KMS device afterwards will be repainting
> anyway.
> 
> Signed-off-by: Daniel Stone <daniels at collabora.com>
> Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> ---
>  libweston/compositor-drm.c | 31 ++++++++++++-------------------
>  1 file changed, 12 insertions(+), 19 deletions(-)
> 
> diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
> index 5c3abee39..d57967972 100644
> --- a/libweston/compositor-drm.c
> +++ b/libweston/compositor-drm.c

> @@ -4296,7 +4290,8 @@ drm_output_destroy(struct weston_output *base)
>  		 */
>  		if (output->cursor_plane)
>  			drm_plane_destroy(output->cursor_plane);
> -		drm_plane_destroy(output->scanout_plane);
> +		if (output->scanout_plane)
> +			drm_plane_destroy(output->scanout_plane);

This hunk belong in the previous patch to make it correct.

>  	}
>  
>  	wl_list_for_each_safe(drm_mode, next, &output->base.mode_list,

Otherwise R-b stands.


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/20180206/531c47d2/attachment.sig>