Mesa (staging/22.0): iris: Fix assertion meant to only target the clear-color stride

[GitLab Mirror]

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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri Apr 29 02:37:25 2022 -0700

iris: Fix assertion meant to only target the clear-color stride

Fixes: 2bc8c61fd00 ("iris: Return a 64B stride for clear color plane")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6398
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16241>
(cherry picked from commit 33456ae5a48c809cee251ca6d70f2b7f5941bc87)

---

 .pick_status.json                        | 2 +-
 src/gallium/drivers/iris/iris_resource.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 21a1e67dcd7..a48e1275a0e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -900,7 +900,7 @@
         "description": "iris: Fix assertion meant to only target the clear-color stride",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "2bc8c61fd00b2877319f54afeaba3d606fd8532c"
     },
     {
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 0a74bc4c213..a1e058efa58 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -1616,7 +1616,7 @@ iris_resource_get_param(struct pipe_screen *pscreen,
        * the plane's pitch should be ignored, some kernels have been found to
        * require 64-byte alignment.
        */
-      assert(*value != 0 && *value % 64 == 0);
+      assert(*value != 0 && (!wants_cc || *value % 64 == 0));
 
       return true;
    case PIPE_RESOURCE_PARAM_OFFSET: