From a46a8097ff730f7bd1e0a932be55b1f2dfc4fd3c Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Wed, 13 Sep 2017 17:22:38 +0300
Subject: [PATCH] compositor-fbdev: always destroy renderer-output on disable

If we pass the base->enabled test, then the renderer output is
guaranteed to be there, so we can just destroy it.

Destroying it before unmap makes the sequence match better the enable
path.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
---
 libweston/compositor-fbdev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
index 22100f982..b3136708d 100644
--- a/libweston/compositor-fbdev.c
+++ b/libweston/compositor-fbdev.c
@@ -486,11 +486,9 @@ fbdev_output_disable_handler(struct weston_output *base)
 	if (!base->enabled)
 		return 0;
 
+	pixman_renderer_output_destroy(&output->base);
 	fbdev_frame_buffer_unmap(output);
 
-	if (base->renderer_state != NULL)
-		pixman_renderer_output_destroy(base);
-
 	return 0;
 }
 
-- 
GitLab