Merge tag 'drm-intel-next-2017-07-17' of git://anongit.freedesktop.org/git/drm-intel...

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / i915 / intel_atomic_plane.c

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 4325cb0a04f5db5e3cdf37e70330283309d93d06..ee76fab7bb6f99f85a3d3136f21f20dcbb2855b4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -114,6 +114,8 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state,
        struct drm_i915_private *dev_priv = to_i915(plane->dev);
        struct drm_plane_state *state = &intel_state->base;
        struct intel_plane *intel_plane = to_intel_plane(plane);
+       const struct drm_display_mode *adjusted_mode =
+               &crtc_state->base.adjusted_mode;
        int ret;
 
        /*
@@ -173,6 +175,19 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state,
        if (ret)
                return ret;
 
+       /*
+        * Y-tiling is not supported in IF-ID Interlace mode in
+        * GEN9 and above.
+        */
+       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) {
+                       DRM_DEBUG_KMS("Y/Yf tiling not supported in IF-ID mode\n");
+                       return -EINVAL;
+               }
+       }
+
        /* FIXME pre-g4x don't work like this */
        if (intel_state->base.visible)
                crtc_state->active_planes |= BIT(intel_plane->id);