Commit 172757ac authored by Animesh Manna's avatar Animesh Manna
Browse files

drm/i915/lobf: Add lobf enablement in post plane update 



Enablement of LOBF is added in post plane update whenever
has_lobf flag is set. As LOBF can be enabled in non-psr
case as well so adding in post plane update. There is no
change of configuring alpm with psr path.

v1: Initial version.
v2: Use encoder-mask to find the associated encoder from
crtc-state. [Jani]
v3: Remove alpm_configure from intel_psr.c. [Jouni]

Signed-off-by: default avatarAnimesh Manna <animesh.manna@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://lore.kernel.org/r/20250423092334.2294483-3-animesh.manna@intel.com
parent 278a7be9

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

+25 −0
Original line number Diff line number Diff line
@@ -367,6 +367,31 @@ void intel_alpm_configure(struct intel_dp *intel_dp, 
	lnl_alpm_configure(intel_dp, crtc_state);

}



void intel_alpm_post_plane_update(struct intel_atomic_state *state,

				  struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(state);

	const struct intel_crtc_state *crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	struct intel_encoder *encoder;



	if (!crtc_state->has_lobf && !crtc_state->has_psr)

		return;



	for_each_intel_encoder_mask(display->drm, encoder,

				    crtc_state->uapi.encoder_mask) {

		struct intel_dp *intel_dp;



		if (!intel_encoder_is_dp(encoder))

			continue;



		intel_dp = enc_to_intel_dp(encoder);



		if (intel_dp_is_edp(intel_dp))

			intel_alpm_configure(intel_dp, crtc_state);

	}

}



static int i915_edp_lobf_info_show(struct seq_file *m, void *data)

{

	struct intel_connector *connector = m->private;

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

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ struct intel_dp; 
struct intel_crtc_state;

struct drm_connector_state;

struct intel_connector;

struct intel_atomic_state;

struct intel_crtc;



void intel_alpm_init_dpcd(struct intel_dp *intel_dp);

bool intel_alpm_compute_params(struct intel_dp *intel_dp,
@@ -21,6 +23,8 @@ void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp, 
				    struct drm_connector_state *conn_state);

void intel_alpm_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_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

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "i9xx_plane.h"

#include "i9xx_plane_regs.h"

#include "i9xx_wm.h"

#include "intel_alpm.h"

#include "intel_atomic.h"

#include "intel_atomic_plane.h"

#include "intel_audio.h"
@@ -1078,6 +1079,8 @@ static void intel_post_plane_update(struct intel_atomic_state *state, 
	if (audio_enabling(old_crtc_state, new_crtc_state))

		intel_encoders_audio_enable(state, crtc);



	intel_alpm_post_plane_update(state, crtc);



	intel_psr_post_plane_update(state, crtc);

}

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

+0 −3
Original line number Diff line number Diff line
@@ -1944,9 +1944,6 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, 
			     intel_dp->psr.psr2_sel_fetch_enabled ?

			     IGNORE_PSR2_HW_TRACKING : 0);



	if (intel_dp_is_edp(intel_dp))

		intel_alpm_configure(intel_dp, crtc_state);



	/*

	 * Wa_16013835468

	 * Wa_14015648006