Commit f3c25031 authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/psr: Add new SU area calculation helper to apply workarounds 



intel_psr2_sel_fetch_update is already quite long function. Now we are
about to add one more HW workaround. Let's split applying workarounds to
selective update area into a separate function.

Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240926064759.1313335-2-jouni.hogander@intel.com
parent e5ffdd86

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

+15 −7
Original line number Diff line number Diff line
@@ -2519,11 +2519,24 @@ static bool psr2_sel_fetch_pipe_state_supported(const struct intel_crtc_state *c 
	return true;

}



static void

intel_psr_apply_su_area_workarounds(struct intel_crtc_state *crtc_state)

{

	struct intel_display *display = to_intel_display(crtc_state);

	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);



	/* Wa_14014971492 */

	if (!crtc_state->has_panel_replay &&

	    ((IS_DISPLAY_VER_STEP(display, IP_VER(14, 0), STEP_A0, STEP_B0) ||

	      IS_ALDERLAKE_P(i915) || IS_TIGERLAKE(i915))) &&

	    crtc_state->splitter.enable)

		crtc_state->psr2_su_area.y1 = 0;

}



int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,

				struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(state);

	struct drm_i915_private *dev_priv = to_i915(state->base.dev);

	struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc);

	struct intel_plane_state *new_plane_state, *old_plane_state;

	struct intel_plane *plane;
@@ -2628,12 +2641,7 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, 
	if (full_update)

		goto skip_sel_fetch_set_loop;



	/* Wa_14014971492 */

	if (!crtc_state->has_panel_replay &&

	    ((IS_DISPLAY_VER_STEP(display, IP_VER(14, 0), STEP_A0, STEP_B0) ||

	      IS_ALDERLAKE_P(dev_priv) || IS_TIGERLAKE(dev_priv))) &&

	    crtc_state->splitter.enable)

		crtc_state->psr2_su_area.y1 = 0;

	intel_psr_apply_su_area_workarounds(crtc_state);



	ret = drm_atomic_add_affected_planes(&state->base, &crtc->base);

	if (ret)