From 2d041d5f1e9a731da3bfaec21494d90f4b560bbb Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Wed, 27 Oct 2021 13:46:08 -0700 Subject: [PATCH] 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 Reviewed-by: Nanley Chery Part-of: --- src/gallium/drivers/iris/iris_resource.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 8610a5531e9..aee9bb6b999 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: