Merge tag 'drm-intel-next-2018-09-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

Driver Changes:

- Bugzilla 107600: Fix stuttering video playback on MythTV on old hardware (Chris)
- Avoid black screen when using CSC coefficient matrix (Raviraj)
- Hammer PDs on Baytrail to make sure they reload (Chris)
- Capture some objects if unable to capture all, on error (Chris)
- Add W/A for 16 GB DIMMs on SKL+ (Mahesh)
- Only enable IPC for symmetric memory configurations on KBL+ (Mahesh)
- Assume pipe A to have maximum stride limits (Ville)
- Always update update OA contexts via context image (Tvrtko)
- Icelake enabling patches (Madhav, Dhinakaran)
- Add Icelake DMC firmware (Anusha)
- Fixes for CI found corner cases (Chris)
- Limit the backpressure for request allocation (Chris)
- Park GPU on module load so usage starts from known state (Chris)
- Flush tasklet when checking for idle (Chris)
- Use coherent write into the context image on BSW+ (Chris)
- Fix possible integer overflow for framebuffers that get aligned past 4GiB (Ville)
- Downgrade fence timeout from warn to notice and add debug hint (Chris)

- Fixes to multi function encoder code (Ville)
- Fix sprite plane check logic (Dan, Ville)
- PAGE_SIZE vs. I915_GTT_PAGE_SIZE fixes (Ville)
- Decode memory bandwidth and parameters for BXT and SKL+ (Mahesh)
- Overwrite BIOS set IPC value from KMS (Mahesh)
- Multiple pipe handling code cleanups/restructurings/optimizations (Ville)
- Spare low 4G address for non-48bit objects (Chris)
- Free context_setparam of struct_mutex (Chris)
- Delay updating ring register state on resume (Chris)
- Avoid unnecessarily copying overlay IOCTL parameters (Chris)
- Update GuC power domain states even without submission (Michal)
- Restore GuC preempt-context across S3/S4 (Chris)
- Add kernel selftest for rapid context switching (Chris)
- Keep runtime power management ref for live selftests (Chris)
- GEM code cleanups (Matt)

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927095933.GA11458@jlahtine-desk.ger.corp.intel.com

1 files changed, 0 insertions, 53 deletions

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index fa7df5fe154b..aabebe0d2e9b 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -113,71 +113,18 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
                                         struct intel_plane_state *intel_state)
 {
         struct drm_plane *plane = intel_state->base.plane;
-        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;
 
         if (!intel_state->base.crtc && !old_plane_state->base.crtc)
                 return 0;
 
-        if (state->fb && drm_rotation_90_or_270(state->rotation)) {
-                struct drm_format_name_buf format_name;
-
-                if (state->fb->modifier != I915_FORMAT_MOD_Y_TILED &&
-                    state->fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
-                        DRM_DEBUG_KMS("Y/Yf tiling required for 90/270!\n");
-                        return -EINVAL;
-                }
-
-                /*
-                 * 90/270 is not allowed with RGB64 16:16:16:16,
-                 * RGB 16-bit 5:6:5, and Indexed 8-bit.
-                 * TBD: Add RGB64 case once its added in supported format list.
-                 */
-                switch (state->fb->format->format) {
-                case DRM_FORMAT_C8:
-                case DRM_FORMAT_RGB565:
-                        DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
-                                      drm_get_format_name(state->fb->format->format,
-                                                          &format_name));
-                        return -EINVAL;
-
-                default:
-                        break;
-                }
-        }
-
-        /* CHV ignores the mirror bit when the rotate bit is set :( */
-        if (IS_CHERRYVIEW(dev_priv) &&
-            state->rotation & DRM_MODE_ROTATE_180 &&
-            state->rotation & DRM_MODE_REFLECT_X) {
-                DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
-                return -EINVAL;
-        }
-
         intel_state->base.visible = false;
         ret = intel_plane->check_plane(crtc_state, intel_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 ||
-                    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;
-                }
-        }
-
         /* FIXME pre-g4x don't work like this */
         if (state->visible)
                 crtc_state->active_planes |= BIT(intel_plane->id);