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 <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12132>
This commit is contained in:
Jordan Justen 2020-06-16 21:53:48 -07:00 committed by Marge Bot
parent bd516c6581
commit fd509ef59d

View file

@ -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: