diff --git a/Mesa.changes b/Mesa.changes
index 0f3bb61..0e164bc 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 28 12:48:56 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- boo1226725-test-fix1.patch
+  * another try to fix coloring on s390x and other platforms
+- re-enabled patchtes only applied on s390x with previous change
+  on all platforms again
+
 -------------------------------------------------------------------
 Thu Jun 27 08:55:00 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 17c50d9..c712afa 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -186,6 +186,7 @@ Patch400:       n_stop-iris-flicker.patch
 Patch500:       u_dri-Fix-BGR-format-exclusion.patch
 Patch501:       u_egl-gbm-Enable-RGBA-configs.patch
 Patch502:       u_egl-surfaceless-Enable-RGBA-configs.patch
+Patch503:       boo1226725-test-fix1.patch
 %ifarch %{ix86} x86_64
 BuildRequires:  DirectX-Headers
 %endif
@@ -840,11 +841,10 @@ cp %{SOURCE6} subprojects/packagecache/
 %patch -P 58 -p1
 %patch -P 100 -p1
 %patch -P 400 -p1
-%ifarch s390x
 %patch -P 500 -p1
 %patch -P 501 -p1
 %patch -P 502 -p1
-%endif
+%patch -P 503 -p1
 
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...
diff --git a/boo1226725-test-fix1.patch b/boo1226725-test-fix1.patch
new file mode 100644
index 0000000..6bcdebd
--- /dev/null
+++ b/boo1226725-test-fix1.patch
@@ -0,0 +1,37 @@
+diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
+index 2e9ce01147a..15dde5152b8 100644
+--- a/src/gallium/frontends/dri/dri_screen.c
++++ b/src/gallium/frontends/dri/dri_screen.c
+@@ -386,21 +386,16 @@ dri_fill_in_modes(struct dri_screen *screen)
+       uint8_t msaa_modes[MSAA_VISUAL_MAX_SAMPLES];
+
+       /* Expose only BGRA ordering if the loader doesn't support RGBA ordering. */
+-      if (!allow_rgba_ordering) {
+-          unsigned sh_ax = util_format_get_component_shift(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 3);
+-          unsigned sh_b = util_format_get_component_shift(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 2);
+-#if UTIL_ARCH_BIG_ENDIAN
+-          unsigned sz_b = util_format_get_component_bits(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 2);
+-
+-          if (sz_b + sh_b == sh_ax)
+-             continue;
+-#else
+-          unsigned sz_ax = util_format_get_component_bits(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 3);
+-
+-          if (sz_ax + sh_ax == sh_b)
+-             continue;
+-#endif
+-       }
++      if (!allow_rgba_ordering &&
++          (pipe_formats[f] == PIPE_FORMAT_RGBA8888_UNORM ||
++           pipe_formats[f] == PIPE_FORMAT_RGBX8888_UNORM ||
++           pipe_formats[f] == PIPE_FORMAT_RGBA8888_SRGB  ||
++           pipe_formats[f] == PIPE_FORMAT_RGBX8888_SRGB  ||
++           pipe_formats[f] == PIPE_FORMAT_R5G5B5A1_UNORM ||
++           pipe_formats[f] == PIPE_FORMAT_R5G5B5X1_UNORM ||
++           pipe_formats[f] == PIPE_FORMAT_R4G4B4A4_UNORM ||
++           pipe_formats[f] == PIPE_FORMAT_R4G4B4X4_UNORM))
++         continue;
+
+       if (!allow_rgb10 &&
+           util_format_get_component_bits(pipe_formats[f],
+