From: Jianxun Zhang <jianxun.zhang@intel.com>
Date: Fri, 16 Dec 2022 19:25:35 +0000 (-0800)
Subject: iris: Limit DG2 modifiers to DG2
X-Git-Tag: upstream/23.3.3~15403
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58e1d14edf74e0cc2c21ddacc0aad5eb2b39a658;p=platform%2Fupstream%2Fmesa.git

iris: Limit DG2 modifiers to DG2

These DG2 modifiers should be disabled on other devices.

Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20363>
---

diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 0649597198f..be76aaaa72f 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -107,10 +107,13 @@ modifier_is_supported(const struct intel_device_info *devinfo,
          return false;
       break;
    case I915_FORMAT_MOD_4_TILED:
+      if (devinfo->verx10 < 125)
+         return false;
+      break;
    case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS:
    case I915_FORMAT_MOD_4_TILED_DG2_MC_CCS:
    case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
-      if (devinfo->verx10 < 125)
+      if (!intel_device_info_is_dg2(devinfo))
          return false;
       break;
    case DRM_FORMAT_MOD_INVALID: