meta-st-stm32mp/recipes-graphics/wayland/weston/0003-Allow-to-get-hdmi-outp...

41 lines
1.2 KiB
Diff

From b18247205600b3648197bb5d2cf5bde703bf6af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yannick=20Fertr=C3=A9?= <yannick.fertre@st.com>
Date: Thu, 20 Dec 2018 11:38:10 +0100
Subject: [PATCH 3/3] Allow to get hdmi output with several outputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If an ouput fail to be attach or enable then this output must be only
destroyed and an error doesn't be re which detach & destroy
all other output.
Signed-off-by: Yannick Fertré <yannick.fertre@st.com>
---
compositor/main.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compositor/main.c b/compositor/main.c
index b5b4fc5..cf94d17 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1743,8 +1743,14 @@ drm_process_layoutput(struct wet_compositor *wet, struct wet_layoutput *lo)
return -1;
if (drm_try_attach_enable(output->output, lo) < 0) {
+ /*
+ * if a wet_ouput fail to be attach or enable
+ * then this output must be destroyed
+ * but don't return an error which dettatch & destroy
+ * all other output.
+ */
wet_output_destroy(output);
- return -1;
+
}
}
--
2.7.4