v3d: upgrade V3D 4.1 to 4.2 version

Some of the new features require at least V3D 4.2. And actually, 4.2 is
the version used by the Raspberry Pi 4 hardware.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22733>

diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build
index ad4c154..dfa1e88 100644 (file)
--- a/src/gallium/drivers/v3d/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -58,7 +58,7 @@ if dep_v3dv3.found()
   v3d_args += '-DUSE_V3D_SIMULATOR'
 endif
 
-v3d_versions = ['33', '41']
+v3d_versions = ['33', '42']
 
 per_version_libs = []
 foreach ver : v3d_versions

diff --git a/src/gallium/drivers/v3d/v3d_context.h b/src/gallium/drivers/v3d/v3d_context.h
index bd33ebc..7f62fba 100644 (file)
--- a/src/gallium/drivers/v3d/v3d_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -827,9 +827,9 @@ void v3d_disk_cache_store(struct v3d_context *v3d,
 
 /* Helper to call hw ver specific functions */
 #define v3d_X(devinfo, thing) ({                                \
-        __typeof(&v3d41_##thing) v3d_X_thing;                   \
-        if ((devinfo)->ver >= 41)                               \
-                v3d_X_thing = &v3d41_##thing;                   \
+        __typeof(&v3d42_##thing) v3d_X_thing;                   \
+        if ((devinfo)->ver >= 42)                               \
+                v3d_X_thing = &v3d42_##thing;                   \
         else if ((devinfo)->ver >= 33)                          \
                 v3d_X_thing = &v3d33_##thing;                   \
         else                                                    \
@@ -844,7 +844,7 @@ void v3d_disk_cache_store(struct v3d_context *v3d,
 #  include "v3dx_context.h"
 #  undef v3dX
 
-#  define v3dX(x) v3d41_##x
+#  define v3dX(x) v3d42_##x
 #  include "v3dx_context.h"
 #  undef v3dX
 #endif