diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index bd87520b591..c508a58b9ac 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -853,7 +853,6 @@ etna_get_specs(struct etna_screen *screen)
    if (info->type == ETNA_CORE_GPU) {
       instruction_count = info->gpu.max_instructions;
       screen->specs.pixel_pipes = info->gpu.pixel_pipes;
-      screen->specs.max_varyings = MIN2(info->gpu.max_varyings, ETNA_NUM_VARYINGS);
 
       if (screen->npu)
          info = etna_gpu_get_core_info(screen->npu);
@@ -966,6 +965,11 @@ etna_get_specs(struct etna_screen *screen)
 
    screen->specs.max_vs_outputs = screen->info->halti >= 5 ? 32 : 16;
 
+   screen->specs.max_varyings = MIN3(ETNA_NUM_VARYINGS,
+                                     info->gpu.max_varyings,
+                                     /* one output slot used for position */
+                                     screen->specs.max_vs_outputs - 1);
+
    screen->specs.max_texture_size =
       VIV_FEATURE(screen, ETNA_FEATURE_TEXTURE_8K) ? 8192 : 2048;
    screen->specs.max_rendertarget_size =