Mesa (main): iris: Wa_14016820455 for GFX_VERx10 == 12.5

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: bc42bbff4ce8bbfe45b0ae593cfeb218bc068200
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc42bbff4ce8bbfe45b0ae593cfeb218bc068200

Author: Zhang, Jianxun <jianxun.zhang at intel.com>
Date:   Tue May 10 12:55:13 2022 -0700

iris: Wa_14016820455 for GFX_VERx10 == 12.5

Reprogram SF CLIP viewport pointer by not skipping its
dirty flag bit.

Many thanks to Lin, Shuicheng <shuicheng.lin at intel.com>,
Jerez Plata, Francisco <francisco.jerez.plata at intel.com>,
Graunke, Kenneth W <kenneth.w.graunke at intel.com>,
and others for their great help.

Signed-off-by: Zhang, Jianxun <jianxun.zhang at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17171>

---

 src/gallium/drivers/iris/iris_blorp.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index a0af9d6d343..2a43ca872cd 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -353,8 +353,15 @@ iris_blorp_exec_render(struct blorp_batch *blorp_batch,
                          IRIS_DIRTY_LINE_STIPPLE |
                          IRIS_ALL_DIRTY_FOR_COMPUTE |
                          IRIS_DIRTY_SCISSOR_RECT |
-                         IRIS_DIRTY_VF |
-                         IRIS_DIRTY_SF_CL_VIEWPORT);
+                         IRIS_DIRTY_VF);
+   /* Wa_14016820455
+    * On Gfx 12.5 platforms, the SF_CL_VIEWPORT pointer can be invalidated
+    * likely by a read cache invalidation when clipping is disabled, so we
+    * don't skip its dirty bit here, in order to reprogram it.
+    */
+   if (GFX_VERx10 != 125)
+      skip_bits |= IRIS_DIRTY_SF_CL_VIEWPORT;
+
    uint64_t skip_stage_bits = (IRIS_ALL_STAGE_DIRTY_FOR_COMPUTE |
                                IRIS_STAGE_DIRTY_UNCOMPILED_VS |
                                IRIS_STAGE_DIRTY_UNCOMPILED_TCS |