diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index e8215773c78..2b14475abcc 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -4552,14 +4552,6 @@ radv_handle_subpass_image_transition(struct radv_cmd_buffer *cmd_buffer,
    cmd_buffer->state.attachments[idx].current_stencil_layout = att.stencil_layout;
 }
 
-void
-radv_cmd_buffer_set_subpass(struct radv_cmd_buffer *cmd_buffer, const struct radv_subpass *subpass)
-{
-   cmd_buffer->state.subpass = subpass;
-
-   cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FRAMEBUFFER;
-}
-
 static VkResult
 radv_cmd_state_setup_sample_locations(struct radv_cmd_buffer *cmd_buffer,
                                       struct radv_render_pass *pass,
@@ -6265,7 +6257,8 @@ radv_cmd_buffer_begin_subpass(struct radv_cmd_buffer *cmd_buffer, uint32_t subpa
 
    radv_emit_subpass_barrier(cmd_buffer, &subpass->start_barrier);
 
-   radv_cmd_buffer_set_subpass(cmd_buffer, subpass);
+   cmd_buffer->state.subpass = subpass;
+   cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FRAMEBUFFER;
 
    radv_describe_barrier_start(cmd_buffer, RGP_BARRIER_EXTERNAL_RENDER_PASS_SYNC);
 
@@ -6363,14 +6356,6 @@ radv_mark_noncoherent_rb(struct radv_cmd_buffer *cmd_buffer)
       cmd_buffer->state.rb_noncoherent_dirty = true;
 }
 
-void
-radv_cmd_buffer_restore_subpass(struct radv_cmd_buffer *cmd_buffer,
-                                const struct radv_subpass *subpass)
-{
-   radv_mark_noncoherent_rb(cmd_buffer);
-   radv_cmd_buffer_set_subpass(cmd_buffer, subpass);
-}
-
 static void
 radv_cmd_buffer_end_subpass(struct radv_cmd_buffer *cmd_buffer)
 {
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 688f91612c8..d54d67a2835 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1716,10 +1716,6 @@ bool radv_cmp_vs_prolog(const void *a_, const void *b_);
 
 bool radv_cmd_buffer_upload_alloc(struct radv_cmd_buffer *cmd_buffer, unsigned size,
                                   unsigned *out_offset, void **ptr);
-void radv_cmd_buffer_set_subpass(struct radv_cmd_buffer *cmd_buffer,
-                                 const struct radv_subpass *subpass);
-void radv_cmd_buffer_restore_subpass(struct radv_cmd_buffer *cmd_buffer,
-                                     const struct radv_subpass *subpass);
 bool radv_cmd_buffer_upload_data(struct radv_cmd_buffer *cmd_buffer, unsigned size,
                                  const void *data, unsigned *out_offset);
 void radv_write_vertex_descriptors(const struct radv_cmd_buffer *cmd_buffer,