Commit 7b24b79b authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display: Fix sel fetch plane offset calculation 



skl_calc_main_surface_offset() is used to calculate an aligned plane
surface address considering the inner framebuffer x and y offset.
It can not be used by selective fetch functions becase there is no
PLANE_SEL_FETCH_SURF.
So the PLANE_SEL_FETCH_OFFSET.y should only be PLANE_OFFSET.y +
damaged_area_within_plane.y1.

This fixes glitches seen in fbcon caused by typing something in
the terminal.

BSpec: 55229
Reviewed-by: default avatarGwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210815014346.373945-1-jose.souza@intel.com
parent d8959fb3

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

+2 −6
Original line number Diff line number Diff line
@@ -1487,8 +1487,8 @@ void intel_psr2_program_plane_sel_fetch(struct intel_plane *plane, 
	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;

	const struct drm_rect *clip;

	u32 val, offset;

	int ret, x, y;

	u32 val;

	int x, y;



	if (!crtc_state->enable_psr2_sel_fetch)

		return;
@@ -1508,10 +1508,6 @@ void intel_psr2_program_plane_sel_fetch(struct intel_plane *plane, 
	/* TODO: consider auxiliary surfaces */

	x = plane_state->uapi.src.x1 >> 16;

	y = (plane_state->uapi.src.y1 >> 16) + clip->y1;

	ret = skl_calc_main_surface_offset(plane_state, &x, &y, &offset);

	if (ret)

		drm_warn_once(&dev_priv->drm, "skl_calc_main_surface_offset() returned %i\n",

			      ret);

	val = y << 16 | x;

	intel_de_write_fw(dev_priv, PLANE_SEL_FETCH_OFFSET(pipe, plane->id),

			  val);