Mesa (staging/21.3): Revert "iris: Disable I915_FORMAT_MOD_Y_TILED_GEN12* on adl-p/display 13"

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 0024a9d44cc0b80ba9a4a33390f9e0b8426f0fc8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0024a9d44cc0b80ba9a4a33390f9e0b8426f0fc8

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Wed Oct 27 13:46:08 2021 -0700

Revert "iris: Disable I915_FORMAT_MOD_Y_TILED_GEN12* on adl-p/display 13"

Round and round we go :)

In the "drm/i915/adlp/fb: Remove CCS FB stride restrictions" series,
https://lists.freedesktop.org/archives/intel-gfx/2021-October/281768.html,
it now appears that kernel can allow these modifiers to work with
adl-p.

This reverts commit d4174f5f052f614a10df2ebc905aec8c4897b057.

Fixes: d4174f5f052 ("iris: Disable I915_FORMAT_MOD_Y_TILED_GEN12* on adl-p/display 13")
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/13565>
(cherry picked from commit 2d041d5f1e9a731da3bfaec21494d90f4b560bbb)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 0a60ead40ab..c2c2e2b3d49 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "Revert \"iris: Disable I915_FORMAT_MOD_Y_TILED_GEN12* on adl-p/display 13\"",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d4174f5f052f614a10df2ebc905aec8c4897b057"
     },
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 8f3662f6e6f..4a126fb43d1 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -99,8 +99,6 @@ modifier_is_supported(const struct intel_device_info *devinfo,
    case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
       if (devinfo->verx10 != 120)
          return false;
-      if (devinfo->display_ver != 12)
-         return false;
       break;
    case DRM_FORMAT_MOD_INVALID:
    default: