From 61ad5a811f3f0fd3305642d5f1f6487bd835f978 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Thu, 10 Nov 2022 18:22:12 +0200
Subject: [PATCH] iris: setup stage bitmask for Wa_22011440098
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes: 40b66a44998 ("anv, iris: Add Wa_22011440098 for DG2")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19636>
(cherry picked from commit 210d95bdb35c2c172f0a3a9527b181f8988a627f)
---
 .pick_status.json                     | 2 +-
 src/gallium/drivers/iris/iris_state.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7299266..e1da497 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2479,7 +2479,7 @@
         "description": "iris: setup stage bitmask for Wa_22011440098",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "40b66a44998407c0a91bf6a1d762d204a56b81a0"
     },
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 79f3758..345f2a2 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -988,6 +988,8 @@ iris_alloc_push_constants(struct iris_batch *batch)
     */
    if (intel_device_info_is_dg2(devinfo)) {
       iris_emit_cmd(batch, GENX(3DSTATE_CONSTANT_ALL), c) {
+         /* Update empty push constants for all stages (bitmask = 11111b) */
+         c.ShaderUpdateEnable = 0x1f;
          c.MOCS = iris_mocs(NULL, &batch->screen->isl_dev, 0);
       }
    }
-- 
2.7.4