Commit 95f7f7d3 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display/adl_p: Allow DC3CO in pipe and port B 



DC3CO is allowed in all the combinations between pipe and port A and B
on alderlake-P.

BSpec: 49196
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Matt Atwood <matthew.s.atwood@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarClint Taylor <Clinton.A.Taylor@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210524214805.259692-4-jose.souza@intel.com
parent b554065c

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

+16 −4
Original line number Diff line number Diff line
@@ -646,12 +646,26 @@ static void tgl_disallow_dc3co_on_psr2_exit(struct intel_dp *intel_dp) 
	tgl_psr2_disable_dc3co(intel_dp);

}



static bool

dc3co_is_pipe_port_compatible(struct intel_dp *intel_dp,

			      struct intel_crtc_state *crtc_state)

{

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum port port = dig_port->base.port;



	if (IS_ALDERLAKE_P(dev_priv))

		return pipe <= PIPE_B && port <= PORT_B;

	else

		return pipe == PIPE_A && port == PORT_A;

}



static void

tgl_dc3co_exitline_compute_config(struct intel_dp *intel_dp,

				  struct intel_crtc_state *crtc_state)

{

	const u32 crtc_vdisplay = crtc_state->uapi.adjusted_mode.crtc_vdisplay;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	u32 exit_scanlines;
@@ -672,9 +686,7 @@ tgl_dc3co_exitline_compute_config(struct intel_dp *intel_dp, 
	if (!(dev_priv->dmc.allowed_dc_mask & DC_STATE_EN_DC3CO))

		return;



	/* B.Specs:49196 DC3CO only works with pipeA and DDIA.*/

	if (to_intel_crtc(crtc_state->uapi.crtc)->pipe != PIPE_A ||

	    dig_port->base.port != PORT_A)

	if (!dc3co_is_pipe_port_compatible(intel_dp, crtc_state))

		return;



	/*