From fd509ef59d7df598013330452600fdd838f56c19 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 16 Jun 2020 21:53:48 -0700 Subject: [PATCH] iris: Disable the Y-tiled modifiers on XeHP+ I915_FORMAT_MOD_Y_TILED_CCS was already disabled for Xe+ due to a change in the CCS layout. Disable the remaining Y-tiled modifiers since XeHP lacks support for Y-tiling. Rework: * Nanley: Include Anuj's fix for the non-CCS modifiers. * Nanley: Split out Anuj's fix into a separate if statement. * Nanley: Rewrite commit message. Signed-off-by: Jordan Justen Reviewed-by: Jason Ekstrand Part-of: --- src/gallium/drivers/iris/iris_resource.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index b6cd0bcc03f..bbc03d47bc0 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -87,6 +87,8 @@ modifier_is_supported(const struct intel_device_info *devinfo, case I915_FORMAT_MOD_Y_TILED: if (devinfo->ver <= 8 && (bind & PIPE_BIND_SCANOUT)) return false; + if (devinfo->verx10 >= 125) + return false; break; case I915_FORMAT_MOD_Y_TILED_CCS: if (devinfo->ver <= 8 || devinfo->ver >= 12) @@ -95,7 +97,7 @@ modifier_is_supported(const struct intel_device_info *devinfo, case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: - if (devinfo->ver != 12) + if (devinfo->verx10 != 120) return false; break; case DRM_FORMAT_MOD_INVALID: