From 73a9f9c5cacb25c333affd566c6ff05f350af774 Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Thu, 14 Sep 2023 16:18:57 +0200
Subject: [PATCH] tu: Actually emit patchpoint for viewports with FDM

At some point I intended to track whether the pipeline had FDM enabled
and set a dirty flag, but I realized that wasn't necessary. However I
forgot to remove the useless tu_cmd_state::pipeline_has_fdm and the
viewport/scissor emission code was still using it. Fix that.

Fixes: 97da0a77341 ("tu: Rewrite to use common Vulkan dynamic state")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25225>
---
 src/freedreno/ci/freedreno-a660-fails.txt | 146 ----------------------
 src/freedreno/vulkan/tu_cmd_buffer.h      |   1 -
 src/freedreno/vulkan/tu_pipeline.cc       |   2 +-
 3 files changed, 1 insertion(+), 148 deletions(-)

diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt
index bed10a7d3c2..0d702d263b8 100644
--- a/src/freedreno/ci/freedreno-a660-fails.txt
+++ b/src/freedreno/ci/freedreno-a660-fails.txt
@@ -17,152 +17,6 @@ dEQP-VK.api.driver_properties.conformance_version,Fail
 dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail
 gmem-dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail
 
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.4_samples.static_nonsubsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.4_samples.static_nonsubsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.4_samples.static_nonsubsampled_2_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.4_samples.static_subsampled_1_2,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.4_samples.static_subsampled_2_1,Fail
-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.4_samples.static_subsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_1_2,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_1,Fail
-bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_subsampled_2_2,Fail
-gmem-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_nonsubsampled_1_2,Fail
-gmem-dEQP-VK.dynamic_rendering.complete_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_1_2,Fail
-gmem-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.1_sample.static_subsampled_2_2,Fail
-gmem-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2,Fail
-gmem-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_2_1,Fail
-gmem-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-gmem-dEQP-VK.dynamic_rendering.partial_secondary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_1,Fail
-gmem-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2,Fail
-gmem-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.divisible_density_size.4_samples.static_subsampled_2_1,Fail
-gmem-dEQP-VK.dynamic_rendering.primary_cmd_buff.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_nonsubsampled_2_2,Fail
-gmem-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-gmem-dEQP-VK.renderpass2.fragment_density_map.2_views.render_copy.non_divisible_density_size.1_sample.static_nonsubsampled_2_2,Fail
-gmem-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.1_sample.static_nonsubsampled_2_1,Fail
-
 dEQP-VK.subgroups.vote.frag_helper.subgroupallequal_bvec2_fragment,Fail
 dEQP-VK.subgroups.vote.frag_helper.subgroupallequal_bvec3_fragment,Fail
 dEQP-VK.subgroups.vote.frag_helper.subgroupallequal_bvec4_fragment,Fail
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.h b/src/freedreno/vulkan/tu_cmd_buffer.h
index 273af570e9a..d05040fb3f7 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.h
+++ b/src/freedreno/vulkan/tu_cmd_buffer.h
@@ -407,7 +407,6 @@ struct tu_cmd_state
    uint32_t max_vbs_bound;
 
    bool per_view_viewport;
-   bool pipeline_has_fdm;
 
    /* saved states to re-emit in TU_CMD_DIRTY_DRAW_STATE case */
    struct tu_draw_state dynamic_state[TU_DYNAMIC_STATE_COUNT];
diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc
index 6215c3edc22..5932a6047d8 100644
--- a/src/freedreno/vulkan/tu_pipeline.cc
+++ b/src/freedreno/vulkan/tu_pipeline.cc
@@ -3602,7 +3602,7 @@ tu_emit_draw_state(struct tu_cmd_buffer *cmd)
 #define DRAW_STATE_FDM(name, id, ...)                                         \
    if ((EMIT_STATE(name) || (cmd->state.dirty & TU_CMD_DIRTY_FDM)) &&         \
        !(cmd->state.pipeline->base.set_state_mask & (1u << id))) {            \
-      if (cmd->state.pipeline_has_fdm) {                                      \
+      if (cmd->state.pipeline->has_fdm) {                                     \
          tu_cs_set_writeable(&cmd->sub_cs, true);                             \
          tu6_emit_##name##_fdm(&cs, cmd, __VA_ARGS__);                        \
          cmd->state.dynamic_state[id] =                                       \