Commit 31106c68 authored by Ankit Nautiyal's avatar Ankit Nautiyal
Browse files

drm/i915/alpm: Simplify and align LOBF checks in pre/post plane update 



The pre_plane_update and post_plane_update hooks essentially
disable/enable lobf feature. Use the existing _is_enabling/is_disabling
logic for this in the pre_plane_update and post_plane_update paths.

Also rename the helpers to intel_alpm_lobf_{en,dis}able().

v2: Remove redeundant checks during enabling/disabling. (Jouni)

Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: default avatarMichał Grzelak <michal.grzelak@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/20260204050250.762718-5-ankit.k.nautiyal@intel.com
parent 8a517b1e

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

+13 −35
Original line number Diff line number Diff line
@@ -452,25 +452,14 @@ void intel_alpm_port_configure(struct intel_dp *intel_dp, 
	intel_de_write(display, PORT_ALPM_LFPS_CTL(port), lfps_ctl_val);

}



void intel_alpm_pre_plane_update(struct intel_atomic_state *state,

				 struct intel_crtc *crtc)

void intel_alpm_lobf_disable(const struct intel_crtc_state *new_crtc_state)

{

	struct intel_display *display = to_intel_display(state);

	const struct intel_crtc_state *crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	const struct intel_crtc_state *old_crtc_state =

		intel_atomic_get_old_crtc_state(state, crtc);

	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;

	struct intel_display *display = to_intel_display(new_crtc_state);

	enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;

	struct intel_encoder *encoder;



	if (DISPLAY_VER(display) < 20)

		return;



	if (crtc_state->has_lobf || crtc_state->has_lobf == old_crtc_state->has_lobf)

		return;



	for_each_intel_encoder_mask(display->drm, encoder,

				    crtc_state->uapi.encoder_mask) {

				    new_crtc_state->uapi.encoder_mask) {

		struct intel_dp *intel_dp;



		if (!intel_encoder_is_dp(encoder))
@@ -481,14 +470,12 @@ void intel_alpm_pre_plane_update(struct intel_atomic_state *state, 
		if (!intel_dp_is_edp(intel_dp))

			continue;



		if (old_crtc_state->has_lobf) {

		mutex_lock(&intel_dp->alpm.lock);

		intel_de_write(display, ALPM_CTL(display, cpu_transcoder), 0);

		drm_dbg_kms(display->drm, "Link off between frames (LOBF) disabled\n");

		mutex_unlock(&intel_dp->alpm.lock);

	}

}

}



void intel_alpm_enable_sink(struct intel_dp *intel_dp,

			    const struct intel_crtc_state *crtc_state)
@@ -507,22 +494,13 @@ void intel_alpm_enable_sink(struct intel_dp *intel_dp, 
	drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG, val);

}



void intel_alpm_post_plane_update(struct intel_atomic_state *state,

				  struct intel_crtc *crtc)

void intel_alpm_lobf_enable(const struct intel_crtc_state *new_crtc_state)

{

	struct intel_display *display = to_intel_display(state);

	const struct intel_crtc_state *crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	const struct intel_crtc_state *old_crtc_state =

		intel_atomic_get_old_crtc_state(state, crtc);

	struct intel_display *display = to_intel_display(new_crtc_state);

	struct intel_encoder *encoder;



	if (crtc_state->has_psr || !crtc_state->has_lobf ||

	    crtc_state->has_lobf == old_crtc_state->has_lobf)

		return;



	for_each_intel_encoder_mask(display->drm, encoder,

				    crtc_state->uapi.encoder_mask) {

				    new_crtc_state->uapi.encoder_mask) {

		struct intel_dp *intel_dp;



		if (!intel_encoder_is_dp(encoder))
@@ -531,8 +509,8 @@ void intel_alpm_post_plane_update(struct intel_atomic_state *state, 
		intel_dp = enc_to_intel_dp(encoder);



		if (intel_dp_is_edp(intel_dp)) {

			intel_alpm_enable_sink(intel_dp, crtc_state);

			intel_alpm_configure(intel_dp, crtc_state);

			intel_alpm_enable_sink(intel_dp, new_crtc_state);

			intel_alpm_configure(intel_dp, new_crtc_state);

		}

	}

}

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

+2 −4
Original line number Diff line number Diff line
@@ -25,12 +25,10 @@ void intel_alpm_configure(struct intel_dp *intel_dp, 
			  const struct intel_crtc_state *crtc_state);

void intel_alpm_enable_sink(struct intel_dp *intel_dp,

			    const struct intel_crtc_state *crtc_state);

void intel_alpm_pre_plane_update(struct intel_atomic_state *state,

				 struct intel_crtc *crtc);

void intel_alpm_lobf_disable(const struct intel_crtc_state *new_crtc_state);

void intel_alpm_port_configure(struct intel_dp *intel_dp,

			       const struct intel_crtc_state *crtc_state);

void intel_alpm_post_plane_update(struct intel_atomic_state *state,

				  struct intel_crtc *crtc);

void intel_alpm_lobf_enable(const struct intel_crtc_state *new_crtc_state);

void intel_alpm_lobf_debugfs_add(struct intel_connector *connector);

bool intel_alpm_aux_wake_supported(struct intel_dp *intel_dp);

bool intel_alpm_aux_less_wake_supported(struct intel_dp *intel_dp);

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

+23 −2
Original line number Diff line number Diff line
@@ -1008,6 +1008,24 @@ static bool intel_casf_disabling(const struct intel_crtc_state *old_crtc_state, 
	return is_disabling(hw.casf_params.casf_enable, old_crtc_state, new_crtc_state);

}



static bool intel_crtc_lobf_enabling(const struct intel_crtc_state *old_crtc_state,

				     const struct intel_crtc_state *new_crtc_state)

{

	if (!new_crtc_state->hw.active)

		return false;



	return is_enabling(has_lobf, old_crtc_state, new_crtc_state);

}



static bool intel_crtc_lobf_disabling(const struct intel_crtc_state *old_crtc_state,

				      const struct intel_crtc_state *new_crtc_state)

{

	if (!old_crtc_state->hw.active)

		return false;



	return is_disabling(has_lobf, old_crtc_state, new_crtc_state);

}



#undef is_disabling

#undef is_enabling
@@ -1055,7 +1073,8 @@ static void intel_post_plane_update(struct intel_atomic_state *state, 
			adl_scaler_ecc_unmask(new_crtc_state);

	}



	intel_alpm_post_plane_update(state, crtc);

	if (intel_crtc_lobf_enabling(old_crtc_state, new_crtc_state))

		intel_alpm_lobf_enable(new_crtc_state);



	intel_psr_post_plane_update(state, crtc);

}
@@ -1152,7 +1171,9 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, 
		intel_atomic_get_new_crtc_state(state, crtc);

	enum pipe pipe = crtc->pipe;



	intel_alpm_pre_plane_update(state, crtc);

	if (intel_crtc_lobf_disabling(old_crtc_state, new_crtc_state))

		intel_alpm_lobf_disable(new_crtc_state);



	intel_psr_pre_plane_update(state, crtc);



	if (intel_crtc_vrr_disabling(state, crtc)) {