commit a9c1e40120934fe45622bbf9b25465076019226a
author Lionel Landwerlin <lionel.g.landwerlin@intel.com> Thu Mar 02 18:35:01 2023 +0200
committer Eric Engestrom <eric@engestrom.ch> Wed Mar 08 18:00:14 2023 +0000
tree 0f46f9ee33edc4668d90fd7b1af432acd5b6f3e4
parent 0b388d97dafdc854bb27a2c063b3bc2327fac9ec

anv: fixup condition for Wa_14016118574

We don't want the WA to kick-in if it's not point/line topology.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: f2645229c2 ("anv: implement Wa_14016118574")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21660>
(cherry picked from commit d82e8e01c8b570a4988bd6e46d9510f3b6872aa4)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 1e5df2f..faa4396 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2830,7 +2830,7 @@
         "description": "anv: fixup condition for Wa_14016118574",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f2645229c2fa6d9c595004a8dc4ee44cebedb5fd"
     },

src/intel/vulkan/genX_cmd_buffer.c

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 2cfafa9..8221072 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -7557,7 +7557,7 @@
         primitive_topology == _3DPRIM_POINTLIST_BF ||
         primitive_topology == _3DPRIM_LINESTRIP_CONT ||
         primitive_topology == _3DPRIM_LINESTRIP_BF ||
-        primitive_topology == _3DPRIM_LINESTRIP_CONT_BF) ||
+        primitive_topology == _3DPRIM_LINESTRIP_CONT_BF) &&
        (vertex_count == 1 || vertex_count == 2)) {
       anv_batch_emit(batch, GENX(PIPE_CONTROL), pc) {
          pc.PostSyncOperation = WriteImmediateData;