Commit ffafd126 authored by Juha-Pekka Heikkila's avatar Juha-Pekka Heikkila Committed by Lucas De Marchi
Browse files

drm/i915/display: Don't allow tile4 framebuffer to do hflip on display20 or greater 



On display ver 20 onwards tile4 is not supported with horizontal flip

Bspec: 69853

Signed-off-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: default avatarSai Teja Pottumuttu <sai.teja.pottumuttu@intel.com>
Signed-off-by: default avatarMika Kahola <mika.kahola@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241007182841.2104740-1-juhapekka.heikkila@gmail.com


(cherry picked from commit 73e8e2f9)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 6df106e9

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

+13 −0
Original line number Diff line number Diff line
@@ -438,6 +438,19 @@ bool intel_fb_needs_64k_phys(u64 modifier) 
				      INTEL_PLANE_CAP_NEED64K_PHYS);

}



/**

 * intel_fb_is_tile4_modifier: Check if a modifier is a tile4 modifier type

 * @modifier: Modifier to check

 *

 * Returns:

 * Returns %true if @modifier is a tile4 modifier.

 */

bool intel_fb_is_tile4_modifier(u64 modifier)

{

	return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,

				      INTEL_PLANE_CAP_TILING_4);

}



static bool check_modifier_display_ver_range(const struct intel_modifier_desc *md,

					     u8 display_ver_from, u8 display_ver_until)

{

drivers/gpu/drm/i915/display/intel_fb.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ bool intel_fb_is_ccs_modifier(u64 modifier); 
bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);

bool intel_fb_is_mc_ccs_modifier(u64 modifier);

bool intel_fb_needs_64k_phys(u64 modifier);

bool intel_fb_is_tile4_modifier(u64 modifier);



bool intel_fb_is_ccs_aux_plane(const struct drm_framebuffer *fb, int color_plane);

int intel_fb_rc_ccs_cc_plane(const struct drm_framebuffer *fb);

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

+11 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,17 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, 
		return -EINVAL;

	}



	/*

	 * Display20 onward tile4 hflip is not supported

	 */

	if (rotation & DRM_MODE_REFLECT_X &&

	    intel_fb_is_tile4_modifier(fb->modifier) &&

	    DISPLAY_VER(dev_priv) >= 20) {

		drm_dbg_kms(&dev_priv->drm,

			    "horizontal flip is not supported with tile4 surface formats\n");

		return -EINVAL;

	}



	if (drm_rotation_90_or_270(rotation)) {

		if (!intel_fb_supports_90_270_rotation(to_intel_framebuffer(fb))) {

			drm_dbg_kms(&dev_priv->drm,