Commit 0d7f4e99 authored by Ankit Nautiyal's avatar Ankit Nautiyal
Browse files

drm/i915/display: Introduce dp/psr_compute_config_late() 



Introduce intel_dp_compute_config_late() to handle late-stage
configuration checks for DP/eDP features. For now, it paves path for
psr_compute_config_late() to handle psr parameters that need to be
computed late.

Move the handling of psr_flag for Wa_18037818876 and setting of non-psr
pipes to intel_psr_compute_config_late() as these are the last things
to be configured for PSR features.

v2: Update dp_compute_config_late() to return int.

Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com> (#v1)
Link: https://lore.kernel.org/r/20251016055415.2101347-8-ankit.k.nautiyal@intel.com
parent 3fdae52c

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

+7 −0
Original line number Diff line number Diff line
@@ -4559,6 +4559,13 @@ static int intel_ddi_compute_config_late(struct intel_encoder *encoder, 
	struct intel_display *display = to_intel_display(encoder);

	struct drm_connector *connector = conn_state->connector;

	u8 port_sync_transcoders = 0;

	int ret = 0;



	if (intel_crtc_has_dp_encoder(crtc_state))

		ret = intel_dp_compute_config_late(encoder, crtc_state, conn_state);



	if (ret)

		return ret;



	drm_dbg_kms(display->drm, "[ENCODER:%d:%s] [CRTC:%d:%s]\n",

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

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

+11 −0
Original line number Diff line number Diff line
@@ -6979,3 +6979,14 @@ void intel_dp_mst_resume(struct intel_display *display) 
		}

	}

}



int intel_dp_compute_config_late(struct intel_encoder *encoder,

				 struct intel_crtc_state *crtc_state,

				 struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_psr_compute_config_late(intel_dp, crtc_state);



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -218,5 +218,8 @@ int intel_dp_compute_min_hblank(struct intel_crtc_state *crtc_state, 
int intel_dp_dsc_bpp_step_x16(const struct intel_connector *connector);

void intel_dp_dpcd_set_probe(struct intel_dp *intel_dp, bool force_on_external);

bool intel_dp_in_hdr_mode(const struct drm_connector_state *conn_state);

int intel_dp_compute_config_late(struct intel_encoder *encoder,

				 struct intel_crtc_state *crtc_state,

				 struct drm_connector_state *conn_state);



#endif /* __INTEL_DP_H__ */

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

+15 −9
Original line number Diff line number Diff line
@@ -1785,15 +1785,6 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, 
		return;



	crtc_state->has_sel_update = intel_sel_update_config_valid(intel_dp, crtc_state);



	/* Wa_18037818876 */

	if (intel_psr_needs_wa_18037818876(intel_dp, crtc_state)) {

		crtc_state->has_psr = false;

		drm_dbg_kms(display->drm,

			    "PSR disabled to workaround PSR FSM hang issue\n");

	}



	intel_psr_set_non_psr_pipes(intel_dp, crtc_state);

}



void intel_psr_get_config(struct intel_encoder *encoder,
@@ -4355,3 +4346,18 @@ bool intel_psr_needs_alpm_aux_less(struct intel_dp *intel_dp, 
{

	return intel_dp_is_edp(intel_dp) && crtc_state->has_panel_replay;

}



void intel_psr_compute_config_late(struct intel_dp *intel_dp,

				   struct intel_crtc_state *crtc_state)

{

	struct intel_display *display = to_intel_display(intel_dp);



	/* Wa_18037818876 */

	if (intel_psr_needs_wa_18037818876(intel_dp, crtc_state)) {

		crtc_state->has_psr = false;

		drm_dbg_kms(display->drm,

			    "PSR disabled to workaround PSR FSM hang issue\n");

	}



	intel_psr_set_non_psr_pipes(intel_dp, crtc_state);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -83,5 +83,7 @@ void intel_psr_debugfs_register(struct intel_display *display); 
bool intel_psr_needs_alpm(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);

bool intel_psr_needs_alpm_aux_less(struct intel_dp *intel_dp,

				   const struct intel_crtc_state *crtc_state);

void intel_psr_compute_config_late(struct intel_dp *intel_dp,

				   struct intel_crtc_state *crtc_state);



#endif /* __INTEL_PSR_H__ */