Commit bef42cb2 authored by Imre Deak's avatar Imre Deak Committed by Rodrigo Vivi
Browse files

drm/i915: Get power refs in encoder->get_power_domains() 



Push getting the reference for the encoders' power domains into the
encoder get_power_domains() hook instead of doing this from the caller.
This way the encoder can store away the corresponding wakerefs.

This fixes the DSI encoder disabling, which didn't release these
power references it acquired during HW state readout.

Note that longtime ownership for the corresponding wakerefs can be thus
acquired / released in two ways. Nevertheless there is always only one
owner for them:

After HW readout (booting/system resume):
- encoder->get_power_domains() acquires
- encoder->disable*() releases

After a modeset (calling intel_atomic_commit()):
- encoder->enable*() acquires
- encoder->disable*() releases

* can be any of the encoder enable/disable hooks.

v2:
- Check that the DSI io_wakerefs are unset both during encoder HW
  readout and enabling. (Chris)

Fixes: 0e6e0be4 ("drm/i915: Markup paired operations on display power domains")
Cc: Vandita Kulkarni <vandita.kulkarni@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190407124655.31536-1-imre.deak@intel.com


(cherry picked from commit 3a52fb7e)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent e1b7058e

drivers/gpu/drm/i915/icl_dsi.c

+20 −20
Original line number Diff line number Diff line
@@ -323,6 +323,21 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder) 
	}

}



static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv,

				     struct intel_dsi *intel_dsi)

{

	enum port port;



	for_each_dsi_port(port, intel_dsi->ports) {

		WARN_ON(intel_dsi->io_wakeref[port]);

		intel_dsi->io_wakeref[port] =

			intel_display_power_get(dev_priv,

						port == PORT_A ?

						POWER_DOMAIN_PORT_DDI_A_IO :

						POWER_DOMAIN_PORT_DDI_B_IO);

	}

}



static void gen11_dsi_enable_io_power(struct intel_encoder *encoder)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -336,13 +351,7 @@ static void gen11_dsi_enable_io_power(struct intel_encoder *encoder) 
		I915_WRITE(ICL_DSI_IO_MODECTL(port), tmp);

	}



	for_each_dsi_port(port, intel_dsi->ports) {

		intel_dsi->io_wakeref[port] =

			intel_display_power_get(dev_priv,

						port == PORT_A ?

						POWER_DOMAIN_PORT_DDI_A_IO :

						POWER_DOMAIN_PORT_DDI_B_IO);

	}

	get_dsi_io_power_domains(dev_priv, intel_dsi);

}



static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)
@@ -1218,20 +1227,11 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, 
	return 0;

}



static u64 gen11_dsi_get_power_domains(struct intel_encoder *encoder,

static void gen11_dsi_get_power_domains(struct intel_encoder *encoder,

					struct intel_crtc_state *crtc_state)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	u64 domains = 0;

	enum port port;



	for_each_dsi_port(port, intel_dsi->ports)

		if (port == PORT_A)

			domains |= BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO);

		else

			domains |= BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO);



	return domains;

	get_dsi_io_power_domains(to_i915(encoder->base.dev),

				 enc_to_intel_dsi(&encoder->base));

}



static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,

drivers/gpu/drm/i915/intel_ddi.c

+8 −9
Original line number Diff line number Diff line
@@ -2075,12 +2075,11 @@ intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port) 
					      intel_aux_power_domain(dig_port);

}



static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder,

static void intel_ddi_get_power_domains(struct intel_encoder *encoder,

					struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_digital_port *dig_port;

	u64 domains;



	/*

	 * TODO: Add support for MST encoders. Atm, the following should never
@@ -2088,10 +2087,10 @@ static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder, 
	 * hook.

	 */

	if (WARN_ON(intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)))

		return 0;

		return;



	dig_port = enc_to_dig_port(&encoder->base);

	domains = BIT_ULL(dig_port->ddi_io_power_domain);

	intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);



	/*

	 * AUX power is only needed for (e)DP mode, and for HDMI mode on TC
@@ -2099,15 +2098,15 @@ static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder, 
	 */

	if (intel_crtc_has_dp_encoder(crtc_state) ||

	    intel_port_is_tc(dev_priv, encoder->port))

		domains |= BIT_ULL(intel_ddi_main_link_aux_domain(dig_port));

		intel_display_power_get(dev_priv,

					intel_ddi_main_link_aux_domain(dig_port));



	/*

	 * VDSC power is needed when DSC is enabled

	 */

	if (crtc_state->dsc_params.compression_enable)

		domains |= BIT_ULL(intel_dsc_power_domain(crtc_state));



	return domains;

		intel_display_power_get(dev_priv,

					intel_dsc_power_domain(crtc_state));

}



void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)

drivers/gpu/drm/i915/intel_display.c

+1 −5
Original line number Diff line number Diff line
@@ -15986,8 +15986,6 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) 
	struct intel_encoder *encoder;



	for_each_intel_encoder(&dev_priv->drm, encoder) {

		u64 get_domains;

		enum intel_display_power_domain domain;

		struct intel_crtc_state *crtc_state;



		if (!encoder->get_power_domains)
@@ -16001,9 +15999,7 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) 
			continue;



		crtc_state = to_intel_crtc_state(encoder->base.crtc->state);

		get_domains = encoder->get_power_domains(encoder, crtc_state);

		for_each_power_domain(domain, get_domains)

			intel_display_power_get(dev_priv, domain);

		encoder->get_power_domains(encoder, crtc_state);

	}

}

drivers/gpu/drm/i915/intel_drv.h

+6 −4
Original line number Diff line number Diff line
@@ -270,9 +270,11 @@ struct intel_encoder { 
	 * be set correctly before calling this function. */

	void (*get_config)(struct intel_encoder *,

			   struct intel_crtc_state *pipe_config);

	/* Returns a mask of power domains that need to be referenced as part

	 * of the hardware state readout code. */

	u64 (*get_power_domains)(struct intel_encoder *encoder,

	/*

	 * Acquires the power domains needed for an active encoder during

	 * hardware state readout.

	 */

	void (*get_power_domains)(struct intel_encoder *encoder,

				  struct intel_crtc_state *crtc_state);

	/*

	 * Called during system suspend after all pending requests for the

CRA Git | Maintained and supported by SUSTech CRA and CCSE