diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index e479aaa1546..458a8dc210c 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -151,15 +151,9 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
         case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
         case PIPE_CAP_CUBE_MAP_ARRAY:
         case PIPE_CAP_TEXTURE_BARRIER:
-                return 1;
-
         case PIPE_CAP_POLYGON_OFFSET_CLAMP:
-                return screen->devinfo.ver >= 42;
-
-
         case PIPE_CAP_TEXTURE_QUERY_LOD:
-                return screen->devinfo.ver >= 42;
-                break;
+                return 1;
 
         case PIPE_CAP_PACKED_UNIFORMS:
                 /* We can't enable this flag, because it results in load_ubo
@@ -183,7 +177,7 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
                 return PIPE_TEXTURE_TRANSFER_BLIT;
 
         case PIPE_CAP_COMPUTE:
-                return screen->has_csd && screen->devinfo.ver >= 42;
+                return screen->has_csd;
 
         case PIPE_CAP_GENERATE_MIPMAP:
                 return v3d_has_feature(screen, DRM_V3D_PARAM_SUPPORTS_TFU);
@@ -346,15 +340,12 @@ v3d_screen_get_shader_param(struct pipe_screen *pscreen, enum pipe_shader_type s
         switch (shader) {
         case PIPE_SHADER_VERTEX:
         case PIPE_SHADER_FRAGMENT:
+        case PIPE_SHADER_GEOMETRY:
                 break;
         case PIPE_SHADER_COMPUTE:
                 if (!screen->has_csd)
                         return 0;
                 break;
-        case PIPE_SHADER_GEOMETRY:
-                if (screen->devinfo.ver < 42)
-                        return 0;
-                break;
         default:
                 return 0;
         }
@@ -444,14 +435,7 @@ v3d_screen_get_shader_param(struct pipe_screen *pscreen, enum pipe_shader_type s
                  }
 
         case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
-                if (screen->has_cache_flush) {
-                        if (screen->devinfo.ver < 42)
-                                return 0;
-                        else
-                                return PIPE_MAX_SHADER_IMAGES;
-                } else {
-                        return 0;
-                }
+                return screen->has_cache_flush ? PIPE_MAX_SHADER_IMAGES : 0;
 
         case PIPE_SHADER_CAP_SUPPORTED_IRS:
                 return 1 << PIPE_SHADER_IR_NIR;