[PATCH v2 9/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile

[Maarten Lankhorst]

Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Den 2023-12-07 kl. 14:00, skrev Jouni Högander:
> We are defining I915_TILING_X and  I915_TILING_Y as 0. No need for these
> ifdefs anymore.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> ---
>   drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index ae6bad4407eb..5522d6725474 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2441,15 +2441,11 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>   		fb->modifier = DRM_FORMAT_MOD_LINEAR;
>   		break;
>   	case PLANE_CTL_TILED_X:
> -#ifdef I915
>   		plane_config->tiling = I915_TILING_X;
> -#endif
>   		fb->modifier = I915_FORMAT_MOD_X_TILED;
>   		break;
>   	case PLANE_CTL_TILED_Y:
> -#ifdef I915
>   		plane_config->tiling = I915_TILING_Y;
> -#endif
>   		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)
>   			if (DISPLAY_VER(dev_priv) >= 14)
>   				fb->modifier = I915_FORMAT_MOD_4_TILED_MTL_RC_CCS;