OpenMandrivaAssociation · Jul 23, 2024 · Jul 29, 2024 · Jul 30, 2024 · Aug 3, 2024 · Aug 9, 2024
diff --git a/.abf.yml b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  mesa-24.1.4.tar.xz: ff468bdc04f865c01b7aa923ddd217850bc1a257
+  mesa-25.0.5.tar.xz: d6427cb320fcbd8bbe223ad69b16619391812fee
diff --git a/31950.patch b/31950.patch
@@ -0,0 +1,82 @@
+From 917e7e7df07b4523f1160e2a32d5e3ece3d74287 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Mon, 4 Nov 2024 17:45:45 +1100
+Subject: [PATCH] dril: Fixup order of pixel formats in drilConfigs
+
+Having the RGB* formats before the BGR* formats in the table causes
+problems where under some circumstances, some applications end up
+with the wrong colors.
+
+The repro case for me is: Xvnc + mutter + chromium
+
+There was an existing comment in dri_fill_in_modes() which explained
+the problem. This was lost when dril_target.c was created.
+
+Fixes: ec7afd2c24c ("dril: rework config creation")
+Fixes: 3de62b2f9a6 ("gallium/dril: Compatibility stub for the legacy DRI loader interface")
+
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+---
+ src/gallium/targets/dril/dril_target.c | 36 +++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 9 deletions(-)
+
+diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
+index 672d50a418224..583728e409326 100644
+--- a/src/gallium/targets/dril/dril_target.c
++++ b/src/gallium/targets/dril/dril_target.c
+@@ -47,25 +47,43 @@
+    CONFIG_ZS(color, PIPE_FORMAT_Z16_UNORM), \
+    CONFIG_ZS(color, PIPE_FORMAT_NONE) \
+
++/*
++ * (copy of a comment in dri_screen.c:dri_fill_in_modes())
++ *
++ * The 32-bit RGBA format must not precede the 32-bit BGRA format.
++ * Likewise for RGBX and BGRX.  Otherwise, the GLX client and the GLX
++ * server may disagree on which format the GLXFBConfig represents,
++ * resulting in swapped color channels.
++ *
++ * The problem, as of 2017-05-30:
++ * When matching a GLXFBConfig to a __DRIconfig, GLX ignores the channel
++ * order and chooses the first __DRIconfig with the expected channel
++ * sizes. Specifically, GLX compares the GLXFBConfig's and __DRIconfig's
++ * __DRI_ATTRIB_{CHANNEL}_SIZE but ignores __DRI_ATTRIB_{CHANNEL}_MASK.
++ *
++ * EGL does not suffer from this problem. It correctly compares the
++ * channel masks when matching EGLConfig to __DRIconfig.
++ */
++
+ static const struct gl_config drilConfigs[] = {
+-   CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
+-   CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
+    CONFIG(PIPE_FORMAT_B8G8R8A8_UNORM),
+    CONFIG(PIPE_FORMAT_B8G8R8X8_UNORM),
+-   CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
+-   CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
++   CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
++   CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
+    CONFIG(PIPE_FORMAT_B10G10R10A2_UNORM),
+    CONFIG(PIPE_FORMAT_B10G10R10X2_UNORM),
+-   CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
+-   CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
+-   CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
+-   CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
+-   CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
++   CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
++   CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
+    CONFIG(PIPE_FORMAT_B5G6R5_UNORM),
+    CONFIG(PIPE_FORMAT_B5G5R5A1_UNORM),
+    CONFIG(PIPE_FORMAT_B5G5R5X1_UNORM),
+    CONFIG(PIPE_FORMAT_B4G4R4A4_UNORM),
+    CONFIG(PIPE_FORMAT_B4G4R4X4_UNORM),
++   CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
++   CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
++   CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
++   CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
++   CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
+ };
+
+ #define RGB UTIL_FORMAT_COLORSPACE_RGB
+-- 
+GitLab
+
diff --git a/34001.patch b/34001.patch
@@ -0,0 +1,267 @@
+From f87d72152c92694d21165c2cd12e844f16755698 Mon Sep 17 00:00:00 2001
+From: David Rosca <david.rosca@amd.com>
+Date: Tue, 11 Mar 2025 13:41:30 +0100
+Subject: [PATCH 1/3] frontends/va: Support A8R8G8B8 format for processing
+
+Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34001>
+---
+ src/gallium/frontends/va/config.c  | 3 +++
+ src/gallium/frontends/va/surface.c | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/gallium/frontends/va/config.c b/src/gallium/frontends/va/config.c
+index aceafe8d7f997..e05096b5df5c3 100644
+--- a/src/gallium/frontends/va/config.c
++++ b/src/gallium/frontends/va/config.c
+@@ -174,6 +174,9 @@ static unsigned int get_screen_supported_va_rt_formats(struct pipe_screen *pscre
+                                           profile,
+                                           entrypoint) ||
+        pscreen->is_video_format_supported(pscreen, PIPE_FORMAT_B8G8R8X8_UNORM,
++                                          profile,
++                                          entrypoint) ||
++       pscreen->is_video_format_supported(pscreen, PIPE_FORMAT_A8R8G8B8_UNORM,
+                                           profile,
+                                           entrypoint))
+       supported_rt_formats |= VA_RT_FORMAT_RGB32;
+diff --git a/src/gallium/frontends/va/surface.c b/src/gallium/frontends/va/surface.c
+index a56696e67bf5a..c82b7cd8d2651 100644
+--- a/src/gallium/frontends/va/surface.c
++++ b/src/gallium/frontends/va/surface.c
+@@ -574,6 +574,7 @@ vlVaQuerySurfaceAttributes(VADriverContextP ctx, VAConfigID config_id,
+       vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B8G8R8A8_UNORM, attribs, &i);
+       vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8G8B8X8_UNORM, attribs, &i);
+       vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B8G8R8X8_UNORM, attribs, &i);
++      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_A8R8G8B8_UNORM, attribs, &i);
+    }
+
+    if (config->rt_format & VA_RT_FORMAT_RGB32_10) {
+@@ -1576,6 +1577,8 @@ static uint32_t pipe_format_to_drm_format(enum pipe_format format)
+       return DRM_FORMAT_XRGB8888;
+    case PIPE_FORMAT_R8G8B8X8_UNORM:
+       return DRM_FORMAT_XBGR8888;
++   case PIPE_FORMAT_A8R8G8B8_UNORM:
++      return DRM_FORMAT_BGRA8888;
+    case PIPE_FORMAT_B10G10R10A2_UNORM:
+       return DRM_FORMAT_ARGB2101010;
+    case PIPE_FORMAT_R10G10B10A2_UNORM:
+-- 
+GitLab
+
+
+From 47a9312a5d2b188f6c875777c5a41070c835f07d Mon Sep 17 00:00:00 2001
+From: David Rosca <david.rosca@amd.com>
+Date: Tue, 11 Mar 2025 13:41:54 +0100
+Subject: [PATCH 2/3] frontends/va: Use ARGB as default fourcc for RGB32 RT
+ format
+
+This matches Intel driver and is what Chromium expects.
+
+Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34001>
+---
+ src/gallium/frontends/va/surface.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/frontends/va/surface.c b/src/gallium/frontends/va/surface.c
+index c82b7cd8d2651..27f3914d3ae44 100644
+--- a/src/gallium/frontends/va/surface.c
++++ b/src/gallium/frontends/va/surface.c
+@@ -1064,7 +1064,7 @@ rt_format_to_fourcc(uint32_t format)
+    case VA_RT_FORMAT_RGBP:
+       return VA_FOURCC_RGBP;
+    case VA_RT_FORMAT_RGB32:
+-      return VA_FOURCC_BGRA;
++      return VA_FOURCC_ARGB;
+    case VA_RT_FORMAT_RGB32_10:
+       return VA_FOURCC_X2R10G10B10;
+    default:
+-- 
+GitLab
+
+
+From 43c99d3928b31e7b2b0fc25250b45fade83f8a06 Mon Sep 17 00:00:00 2001
+From: David Rosca <david.rosca@amd.com>
+Date: Tue, 11 Mar 2025 13:58:48 +0100
+Subject: [PATCH 3/3] frontends/va: Don't filter supported formats according to
+ config RT format
+
+This matches Intel driver. Chromium always sets RT format to YUV420
+which would cause us to not report other formats as supported.
+Only check that the RT format is actually supported when creating
+config, but don't limit supported surface formats.
+
+Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34001>
+---
+ src/gallium/frontends/va/config.c     | 20 ++-----
+ src/gallium/frontends/va/surface.c    | 81 +++++++++++++--------------
+ src/gallium/frontends/va/va_private.h |  1 -
+ 3 files changed, 43 insertions(+), 59 deletions(-)
+
+diff --git a/src/gallium/frontends/va/config.c b/src/gallium/frontends/va/config.c
+index e05096b5df5c3..588b69bfaf2c4 100644
+--- a/src/gallium/frontends/va/config.c
++++ b/src/gallium/frontends/va/config.c
+@@ -640,9 +640,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin
+                                                                 config->entrypoint);
+       for (int i = 0; i < num_attribs; i++) {
+          if (attrib_list[i].type == VAConfigAttribRTFormat) {
+-            if (attrib_list[i].value & supported_rt_formats) {
+-               config->rt_format = attrib_list[i].value;
+-            } else {
++            if (!(attrib_list[i].value & supported_rt_formats)) {
+                FREE(config);
+                return VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT;
+             }
+@@ -653,10 +651,6 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin
+          }
+       }
+
+-      /* Default value if not specified in the input attributes. */
+-      if (!config->rt_format)
+-         config->rt_format = supported_rt_formats;
+-
+       mtx_lock(&drv->mutex);
+       *config_id = handle_table_add(drv->htab, config);
+       mtx_unlock(&drv->mutex);
+@@ -733,9 +727,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin
+          }
+       }
+       if (attrib_list[i].type == VAConfigAttribRTFormat) {
+-         if (attrib_list[i].value & supported_rt_formats) {
+-            config->rt_format = attrib_list[i].value;
+-         } else {
++         if (!(attrib_list[i].value & supported_rt_formats)) {
+             FREE(config);
+             return VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT;
+          }
+@@ -756,10 +748,6 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin
+       }
+    }
+
+-   /* Default value if not specified in the input attributes. */
+-   if (!config->rt_format)
+-      config->rt_format = supported_rt_formats;
+-
+    mtx_lock(&drv->mutex);
+    *config_id = handle_table_add(drv->htab, config);
+    mtx_unlock(&drv->mutex);
+@@ -836,7 +824,9 @@ vlVaQueryConfigAttributes(VADriverContextP ctx, VAConfigID config_id, VAProfile
+
+    *num_attribs = 1;
+    attrib_list[0].type = VAConfigAttribRTFormat;
+-   attrib_list[0].value = config->rt_format;
++   attrib_list[0].value = get_screen_supported_va_rt_formats(drv->pipe->screen,
++                                                             config->profile,
++                                                             config->entrypoint);
+
+    return VA_STATUS_SUCCESS;
+ }
+diff --git a/src/gallium/frontends/va/surface.c b/src/gallium/frontends/va/surface.c
+index 27f3914d3ae44..cfbc5845e3666 100644
+--- a/src/gallium/frontends/va/surface.c
++++ b/src/gallium/frontends/va/surface.c
+@@ -540,49 +540,44 @@ vlVaQuerySurfaceAttributes(VADriverContextP ctx, VAConfigID config_id,
+
+    i = 0;
+
+-   if (config->rt_format & VA_RT_FORMAT_YUV420) {
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_NV12, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_YV12, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_IYUV, attribs, &i);
+-   }
+-
+-   if (config->rt_format & VA_RT_FORMAT_YUV420_10) {
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_P010, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_P016, attribs, &i);
+-   }
+-
+-   if (config->rt_format & VA_RT_FORMAT_YUV420_12)
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_P012, attribs, &i);
+-
+-   if (config->rt_format & VA_RT_FORMAT_YUV400)
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_Y8_400_UNORM, attribs, &i);
+-
+-   if (config->rt_format & VA_RT_FORMAT_YUV422) {
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_UYVY, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_YUYV, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_Y8_U8_V8_440_UNORM, attribs, &i);
+-   }
+-
+-   if (config->rt_format & VA_RT_FORMAT_YUV444)
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_Y8_U8_V8_444_UNORM, attribs, &i);
+-
+-   if (config->rt_format & VA_RT_FORMAT_RGBP)
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8_G8_B8_UNORM, attribs, &i);
+-
+-   if (config->rt_format & VA_RT_FORMAT_RGB32) {
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8G8B8A8_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B8G8R8A8_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8G8B8X8_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B8G8R8X8_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_A8R8G8B8_UNORM, attribs, &i);
+-   }
+-
+-   if (config->rt_format & VA_RT_FORMAT_RGB32_10) {
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R10G10B10A2_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B10G10R10A2_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R10G10B10X2_UNORM, attribs, &i);
+-      vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B10G10R10X2_UNORM, attribs, &i);
+-   }
++   /* VA_RT_FORMAT_YUV420 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_NV12, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_YV12, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_IYUV, attribs, &i);
++
++   /* VA_RT_FORMAT_YUV420_10 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_P010, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_P016, attribs, &i);
++
++   /* VA_RT_FORMAT_YUV420_12 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_P012, attribs, &i);
++
++   /* VA_RT_FORMAT_YUV400 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_Y8_400_UNORM, attribs, &i);
++
++   /* VA_RT_FORMAT_YUV422 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_UYVY, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_YUYV, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_Y8_U8_V8_440_UNORM, attribs, &i);
++
++   /* VA_RT_FORMAT_YUV444 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_Y8_U8_V8_444_UNORM, attribs, &i);
++
++   /* VA_RT_FORMAT_RGBP */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8_G8_B8_UNORM, attribs, &i);
++
++   /* VA_RT_FORMAT_RGB32 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8G8B8A8_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B8G8R8A8_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R8G8B8X8_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B8G8R8X8_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_A8R8G8B8_UNORM, attribs, &i);
++
++   /* VA_RT_FORMAT_RGB32_10 */
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R10G10B10A2_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B10G10R10A2_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_R10G10B10X2_UNORM, attribs, &i);
++   vlVaAddSurfaceFormat(pscreen, config, PIPE_FORMAT_B10G10R10X2_UNORM, attribs, &i);
+
+    attribs[i].type = VASurfaceAttribMemoryType;
+    attribs[i].value.type = VAGenericValueTypeInteger;
+diff --git a/src/gallium/frontends/va/va_private.h b/src/gallium/frontends/va/va_private.h
+index 81e04a23e0d65..e1acc1843a155 100644
+--- a/src/gallium/frontends/va/va_private.h
++++ b/src/gallium/frontends/va/va_private.h
+@@ -447,7 +447,6 @@ typedef struct {
+    enum pipe_video_profile profile;
+    enum pipe_video_entrypoint entrypoint;
+    enum pipe_h2645_enc_rate_control_method rc;
+-   unsigned int rt_format;
+ } vlVaConfig;
+
+ typedef struct vlVaSurface {
+-- 
+GitLab
+