diff --git a/.pick_status.json b/.pick_status.json
index d94d1d27fb4..dc7908eec30 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2144,7 +2144,7 @@
         "description": "tu: Fix per-view viewport state propagation",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "97da0a7734188f4b666bc38833bfadc8b4c53f84",
         "notes": null
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc
index 5731fce05b2..0577b1f8b9b 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.cc
+++ b/src/freedreno/vulkan/tu_cmd_buffer.cc
@@ -2852,8 +2852,8 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer,
       cmd->state.rp.has_tess = true;
    }
 
-   if (pipeline->viewport.per_view_viewport != cmd->state.per_view_viewport) {
-      cmd->state.per_view_viewport = pipeline->viewport.per_view_viewport;
+   if (pipeline->program.per_view_viewport != cmd->state.per_view_viewport) {
+      cmd->state.per_view_viewport = pipeline->program.per_view_viewport;
       cmd->state.dirty |= TU_CMD_DIRTY_PER_VIEW_VIEWPORT;
    }
 
diff --git a/src/freedreno/vulkan/tu_pipeline.h b/src/freedreno/vulkan/tu_pipeline.h
index d860ef78b09..c184bb8dc7b 100644
--- a/src/freedreno/vulkan/tu_pipeline.h
+++ b/src/freedreno/vulkan/tu_pipeline.h
@@ -140,11 +140,6 @@ struct tu_pipeline
       unsigned patch_type;
    } tess;
 
-   /* for dynamic states which use the same register: */
-   struct {
-      bool per_view_viewport;
-   } viewport;
-
    struct {
       bool raster_order_attachment_access;
    } ds;