drm/i915: Reject compressed Y/Yf with interlaced modes

Y/Yf tiling can't be used with IF-ID. We already reject uncompressed
Y/Yf but we should also reject them when compressed.

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180828142707.31583-2-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Mahesh Kumar <mahesh1.sh.kumar@gmail.com>

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index eddcdd6e4b3bf418b1bc9295d62b5053996a3d4d..fa7df5fe154bf06bdfc5e6eea12484e80db9de9d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -170,7 +170,9 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
        if (state->fb && INTEL_GEN(dev_priv) >= 9 && crtc_state->base.enable &&
            adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {
                if (state->fb->modifier == I915_FORMAT_MOD_Y_TILED ||
-                   state->fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
+                   state->fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
+                   state->fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+                   state->fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS) {
                        DRM_DEBUG_KMS("Y/Yf tiling not supported in IF-ID mode\n");
                        return -EINVAL;
                }