diff --git a/.pick_status.json b/.pick_status.json
index 5f059794062..3bc0bb46a36 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "r600/sfn: Lower tess levels to vectors in TCS",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "84006587d7e5b87526a9b83135393251afeef777"
     },
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index e5762c714bd..38077351559 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -1375,7 +1375,8 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
 		.lower_int64_options = ~0,
 		.lower_cs_local_index_to_id = true,
 		.lower_uniforms_to_ubo = true,
-		.lower_image_offset_to_range_base = 1
+		.lower_image_offset_to_range_base = 1,
+		.vectorize_tess_levels = 1
 	};
 
 	rscreen->nir_options = nir_options;