Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11f489d3 authored by Mahesh Kumar's avatar Mahesh Kumar Committed by Ville Syrjälä
Browse files

drm/i915/skl+: Check for supported plane configuration in Interlace mode 



In Gen9 platform Interlaced fetch mode doesn't support following plane
configuration:
 - Y/Yf tiling
 - 90/270 rotation
 - YUV420 hybrid planar source pixel formats.

This patch adds check to fail the flip if any of the above configuration
is requested.

Changes since V1:
 - handle checks in intel_plane_atomic_check_with_state (ville)
 - takeout plane scaler checks combile with pipe scaler in next patch
Changes since V2:
 - No need to check for NV12 as it need scaling, so it will be rejected
   by scaling check (ville)

Signed-off-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170630121100.20159-2-mahesh1.kumar@intel.com
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90238


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 15727ed0

drivers/gpu/drm/i915/intel_atomic_plane.c

+15 −0
Original line number Diff line number Diff line
@@ -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);