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

drm/i915/psr: Panel replay has to be enabled before link training 



Panel replay has to be enabled on sink side before link training. Take this
into account in fastset check and in initial fastset check.

Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarAnimesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240405113602.992714-9-jouni.hogander@intel.com
parent 88ae6c65

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

+12 −0
Original line number Diff line number Diff line
@@ -5298,6 +5298,18 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		PIPE_CONF_CHECK_CSC(output_csc);

	}



	/*

	 * Panel replay has to be enabled before link training. PSR doesn't have

	 * this requirement -> check these only if using panel replay

	 */

	if (current_config->has_panel_replay || pipe_config->has_panel_replay) {

		PIPE_CONF_CHECK_BOOL(has_psr);

		PIPE_CONF_CHECK_BOOL(has_psr2);

		PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch);

		PIPE_CONF_CHECK_BOOL(enable_psr2_su_region_et);

		PIPE_CONF_CHECK_BOOL(has_panel_replay);

	}



	PIPE_CONF_CHECK_BOOL(double_wide);



	if (dev_priv->display.dpll.mgr)

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

+8 −0
Original line number Diff line number Diff line
@@ -3386,6 +3386,14 @@ bool intel_dp_initial_fastset_check(struct intel_encoder *encoder, 
		fastset = false;

	}



	if (CAN_PANEL_REPLAY(intel_dp)) {

		drm_dbg_kms(&i915->drm,

			    "[ENCODER:%d:%s] Forcing full modeset to compute panel replay state\n",

			    encoder->base.base.id, encoder->base.name);

		crtc_state->uapi.mode_changed = true;

		fastset = false;

	}



	return fastset;

}

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

+0 −3
Original line number Diff line number Diff line
@@ -192,9 +192,6 @@ 
#define CAN_PSR(intel_dp) ((intel_dp)->psr.sink_support && \

			   (intel_dp)->psr.source_support)



#define CAN_PANEL_REPLAY(intel_dp) ((intel_dp)->psr.sink_panel_replay_support && \

				    (intel_dp)->psr.source_panel_replay_support)



bool intel_encoder_can_psr(struct intel_encoder *encoder)

{

	if (intel_encoder_is_dp(encoder) || encoder->type == INTEL_OUTPUT_DP_MST)

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

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ struct intel_encoder; 
struct intel_plane;

struct intel_plane_state;



#define CAN_PANEL_REPLAY(intel_dp) ((intel_dp)->psr.sink_panel_replay_support && \

				    (intel_dp)->psr.source_panel_replay_support)



bool intel_encoder_can_psr(struct intel_encoder *encoder);

void intel_psr_init_dpcd(struct intel_dp *intel_dp);

void intel_psr_enable_sink(struct intel_dp *intel_dp,