From: José Roberto de Souza <jose.souza@intel.com>
Date: Mon, 26 Dec 2022 19:40:39 +0000 (-0800)
Subject: intel/genxml/gen12.5: Pipe_Control::Remove Global Snapshot Count Reset
X-Git-Tag: upstream/23.3.3~15191
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=def474e916b69b86ed49c895c7418ba54a0e8252;p=platform%2Fupstream%2Fmesa.git

intel/genxml/gen12.5: Pipe_Control::Remove Global Snapshot Count Reset

It was not meant to be used(Iris have assert for it) and it was
removed from Pipe_Control instruction in gen12.5 and newer.

BSpec: 47112
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20444>
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index d188817..e85cb30 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -8274,8 +8274,10 @@ iris_emit_raw_pipe_control(struct iris_batch *batch,
       pc.DCFlushEnable = flags & PIPE_CONTROL_DATA_CACHE_FLUSH;
       pc.StoreDataIndex = 0;
       pc.CommandStreamerStallEnable = flags & PIPE_CONTROL_CS_STALL;
+#if GFX_VERx10 < 125
       pc.GlobalSnapshotCountReset =
          flags & PIPE_CONTROL_GLOBAL_SNAPSHOT_COUNT_RESET;
+#endif
       pc.TLBInvalidate = flags & PIPE_CONTROL_TLB_INVALIDATE;
       pc.GenericMediaStateClear = flags & PIPE_CONTROL_MEDIA_STATE_CLEAR;
       pc.StallAtPixelScoreboard = flags & PIPE_CONTROL_STALL_AT_SCOREBOARD;
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 1cb5d11..d8ab604 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -6563,7 +6563,6 @@
     <field name="Generic Media State Clear" start="48" end="48" type="bool" />
     <field name="PSS Stall Sync Enable" start="49" end="49" type="bool" />
     <field name="TLB Invalidate" start="50" end="50" type="bool" />
-    <field name="Global Snapshot Count Reset" start="51" end="51" type="bool" />
     <field name="Command Streamer Stall Enable" start="52" end="52" type="bool" />
     <field name="Store Data Index" start="53" end="53" type="uint" />
     <field name="Protected Memory Enable" start="54" end="54" type="bool" />