diff --git a/.pick_status.json b/.pick_status.json
index a824d44fc27..227fa798033 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -654,7 +654,7 @@
         "description": "etnaviv: fix segfault after compile failure",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3d496190715b012613c58de1f22c043e1573d671",
         "notes": null
diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index b483966bfff..e0054f94332 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -347,9 +347,9 @@ etna_shader_update_vs_inputs(struct compiled_shader_state *cs,
 }
 
 static inline const char *
-etna_shader_stage(struct etna_shader_variant *shader)
+etna_shader_stage(struct etna_shader *shader)
 {
-   switch (shader->stage) {
+   switch (shader->nir->info.stage) {
    case MESA_SHADER_VERTEX:     return "VERT";
    case MESA_SHADER_FRAGMENT:   return "FRAG";
    case MESA_SHADER_COMPUTE:    return "CL";
@@ -368,7 +368,7 @@ dump_shader_info(struct etna_shader_variant *v, struct util_debug_callback *debu
    util_debug_message(debug, SHADER_INFO,
          "%s shader: %u instructions, %u temps, "
          "%u immediates, %u loops",
-         etna_shader_stage(v),
+         etna_shader_stage(v->shader),
          v->code_size / 4,
          v->num_temps,
          v->uniforms.count,
@@ -445,7 +445,7 @@ etna_shader_variant(struct etna_shader *shader,
       perf_debug_message(debug, SHADER_INFO,
                          "%s shader: recompiling at draw time: global "
                          "0x%08x\n",
-                         etna_shader_stage(v), key->global);
+                         etna_shader_stage(shader), key->global);
    }
 
    return v;