Commit d89357de authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Simplify the modifier check for interlaced scanout support 



Checking the modifiers that support interlacing makes the condition
simpler and avoids us having to add new modifiers to the list (presuming
all/most of the new modifiers won't support interlacing).

Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211020195138.1841242-5-imre.deak@intel.com
parent 3dfb2d6b

drivers/gpu/drm/i915/display/skl_universal_plane.c

+2 −7
Original line number Diff line number Diff line
@@ -1235,13 +1235,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, 
	/* Y-tiling is not supported in IF-ID Interlace mode */

	if (crtc_state->hw.enable &&

	    crtc_state->hw.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE &&

	    (fb->modifier == I915_FORMAT_MOD_Y_TILED ||

	     fb->modifier == I915_FORMAT_MOD_Yf_TILED ||

	     fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||

	     fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||

	     fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||

	     fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||

	     fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC)) {

	    fb->modifier != DRM_FORMAT_MOD_LINEAR &&

	    fb->modifier != I915_FORMAT_MOD_X_TILED) {

		drm_dbg_kms(&dev_priv->drm,

			    "Y/Yf tiling not supported in IF-ID mode\n");

		return -EINVAL;