Mesa (staging/22.0): iris: set a default EDSC flag

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 4c9b36b53532782d20d3543442b6d1cdd8b7e93e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c9b36b53532782d20d3543442b6d1cdd8b7e93e

Author: Rohan Garg <rohan.garg at intel.com>
Date:   Tue Apr 12 21:07:13 2022 +0200

iris: set a default EDSC flag

anv sets the default EDSC flag, do the same for iris too

Fixes: 5ae278da18b6 ("iris: use vtbl to avoid multiple symbols, fix state base address")

Signed-off-by: Rohan Garg <rohan.garg at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15905>
(cherry picked from commit 581035b3a9db28cfcd2fac3e1ed1bae259c61fed)

---

 .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 e3f85eb21c8..17c4e6d07d7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -124,7 +124,7 @@
         "description": "iris: set a default EDSC flag",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "5ae278da18b63a03a1f38ecdb935a28484917dca"
     },
     {
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 705d42e79d5..b6ccff69142 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6345,6 +6345,8 @@ iris_upload_dirty_render_state(struct iris_context *ice,
             wm.EarlyDepthStencilControl = EDSC_PREPS;
          else if (wm_prog_data->has_side_effects)
             wm.EarlyDepthStencilControl = EDSC_PSEXEC;
+         else
+            wm.EarlyDepthStencilControl = EDSC_NORMAL;
 
          /* We could skip this bit if color writes are enabled. */
          if (wm_prog_data->has_side_effects || wm_prog_data->uses_kill)