From 2809bb849998efc5b568b0d50307bd5d1014bb72 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 13 Feb 2023 15:25:06 +0000
Subject: [PATCH] broadcom/ci: re-enable egl on wayland

Swap them, as suggested by @enunes, to avoid a ton of timeouts in
wayland if the x11 tests ran first.

Needs to be investigated, but at least like this we can get the CI
coverage back.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21453>
---
 src/broadcom/ci/deqp-broadcom-rpi3-egl.toml | 23 ++++++++++-----------
 src/broadcom/ci/deqp-broadcom-rpi4-egl.toml | 23 ++++++++++-----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
index 6b94186e1bd..f2ad0142feb 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
@@ -1,3 +1,14 @@
+# wayland
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
+
 # x11
 [[deqp]]
 deqp = "/deqp/modules/egl/deqp-egl"
@@ -8,15 +19,3 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 prefix = "x11-"
-
-# Disabled due to timeouts since wayland platform was enabled
-# See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480#note_1702748
-#[[deqp]]
-#deqp = "/deqp/modules/egl/deqp-egl-wayland"
-#caselists = ["/deqp/mustpass/egl-master.txt"]
-#deqp_args = [
-#    "--deqp-surface-width=256", "--deqp-surface-height=256",
-#    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
-#    "--deqp-gl-config-name=rgba8888d24s8ms0",
-#]
-#prefix = "wayland-"
diff --git a/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
index 6b94186e1bd..f2ad0142feb 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
@@ -1,3 +1,14 @@
+# wayland
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
+
 # x11
 [[deqp]]
 deqp = "/deqp/modules/egl/deqp-egl"
@@ -8,15 +19,3 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 prefix = "x11-"
-
-# Disabled due to timeouts since wayland platform was enabled
-# See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480#note_1702748
-#[[deqp]]
-#deqp = "/deqp/modules/egl/deqp-egl-wayland"
-#caselists = ["/deqp/mustpass/egl-master.txt"]
-#deqp_args = [
-#    "--deqp-surface-width=256", "--deqp-surface-height=256",
-#    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
-#    "--deqp-gl-config-name=rgba8888d24s8ms0",
-#]
-#prefix = "wayland-"