On Fri, Feb 10, 2017 at 03:29:55PM +0200, Ander Conselvan de Oliveira wrote:
> The encoder power domain is obviously tied to the encoder, so store it
> in struct intel_encoder. This avoids some indirection.
>
> v2: Rebase
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@xxxxxxxxx>
Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_crt.c | 21 +++++++++------------
> drivers/gpu/drm/i915/intel_ddi.c | 15 +++++++--------
> drivers/gpu/drm/i915/intel_display.c | 31 ++-----------------------------
> drivers/gpu/drm/i915/intel_dp.c | 8 ++++----
> drivers/gpu/drm/i915/intel_dp_mst.c | 1 +
> drivers/gpu/drm/i915/intel_drv.h | 4 ++--
> drivers/gpu/drm/i915/intel_dsi.c | 9 +++++----
> drivers/gpu/drm/i915/intel_dvo.c | 1 +
> drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++----
> drivers/gpu/drm/i915/intel_lvds.c | 8 ++++----
> drivers/gpu/drm/i915/intel_sdvo.c | 1 +
> drivers/gpu/drm/i915/intel_tv.c | 1 +
> 12 files changed, 41 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 2bf5aca..8c82607 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -69,12 +69,11 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_crt *crt = intel_encoder_to_crt(encoder);
> - enum intel_display_power_domain power_domain;
> u32 tmp;
> bool ret;
>
> - power_domain = intel_display_port_power_domain(encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder->power_domain))
> return false;
>
> ret = false;
> @@ -91,7 +90,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
>
> ret = true;
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, encoder->power_domain);
>
> return ret;
> }
> @@ -676,7 +675,6 @@ intel_crt_detect(struct drm_connector *connector, bool force)
> struct drm_i915_private *dev_priv = to_i915(connector->dev);
> struct intel_crt *crt = intel_attached_crt(connector);
> struct intel_encoder *intel_encoder = &crt->base;
> - enum intel_display_power_domain power_domain;
> enum drm_connector_status status;
> struct intel_load_detect_pipe tmp;
> struct drm_modeset_acquire_ctx ctx;
> @@ -689,8 +687,7 @@ intel_crt_detect(struct drm_connector *connector, bool force)
> if (dmi_check_system(intel_spurious_crt_detect))
> return connector_status_disconnected;
>
> - power_domain = intel_display_port_power_domain(intel_encoder);
> - intel_display_power_get(dev_priv, power_domain);
> + intel_display_power_get(dev_priv, intel_encoder->power_domain);
>
> if (I915_HAS_HOTPLUG(dev_priv)) {
> /* We can not rely on the HPD pin always being correctly wired
> @@ -745,7 +742,7 @@ intel_crt_detect(struct drm_connector *connector, bool force)
> drm_modeset_acquire_fini(&ctx);
>
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, intel_encoder->power_domain);
> return status;
> }
>
> @@ -761,12 +758,10 @@ static int intel_crt_get_modes(struct drm_connector *connector)
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_crt *crt = intel_attached_crt(connector);
> struct intel_encoder *intel_encoder = &crt->base;
> - enum intel_display_power_domain power_domain;
> int ret;
> struct i2c_adapter *i2c;
>
> - power_domain = intel_display_port_power_domain(intel_encoder);
> - intel_display_power_get(dev_priv, power_domain);
> + intel_display_power_get(dev_priv, intel_encoder->power_domain);
>
> i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->vbt.crt_ddc_pin);
> ret = intel_crt_ddc_get_modes(connector, i2c);
> @@ -778,7 +773,7 @@ static int intel_crt_get_modes(struct drm_connector *connector)
> ret = intel_crt_ddc_get_modes(connector, i2c);
>
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, intel_encoder->power_domain);
>
> return ret;
> }
> @@ -904,6 +899,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
>
> crt->adpa_reg = adpa_reg;
>
> + crt->base.power_domain = POWER_DOMAIN_PORT_CRT;
> +
> crt->base.compute_config = intel_crt_compute_config;
> if (HAS_PCH_SPLIT(dev_priv)) {
> crt->base.disable = pch_disable_crt;
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index cd6fedd..b0c4d23 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1316,12 +1316,11 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
> enum port port = intel_ddi_get_encoder_port(intel_encoder);
> enum pipe pipe = 0;
> enum transcoder cpu_transcoder;
> - enum intel_display_power_domain power_domain;
> uint32_t tmp;
> bool ret;
>
> - power_domain = intel_display_port_power_domain(intel_encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + intel_encoder->power_domain))
> return false;
>
> if (!intel_encoder->get_hw_state(intel_encoder, &pipe)) {
> @@ -1363,7 +1362,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
> }
>
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, intel_encoder->power_domain);
>
> return ret;
> }
> @@ -1374,13 +1373,12 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> enum port port = intel_ddi_get_encoder_port(encoder);
> - enum intel_display_power_domain power_domain;
> u32 tmp;
> int i;
> bool ret;
>
> - power_domain = intel_display_port_power_domain(encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder->power_domain))
> return false;
>
> ret = false;
> @@ -1437,7 +1435,7 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
> "(PHY_CTL %08x)\n", port_name(port), tmp);
> }
>
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, encoder->power_domain);
>
> return ret;
> }
> @@ -2216,6 +2214,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> intel_dig_port->max_lanes = max_lanes;
>
> intel_encoder->type = INTEL_OUTPUT_UNKNOWN;
> + intel_encoder->power_domain = intel_port_to_power_domain(port);
> intel_encoder->port = port;
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
> intel_encoder->cloneable = 0;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 1e70776..585d149 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5570,7 +5570,7 @@ static void i9xx_pfit_enable(struct intel_crtc *crtc)
> I915_WRITE(BCLRPAT(crtc->pipe), 0);
> }
>
> -static enum intel_display_power_domain port_to_power_domain(enum port port)
> +enum intel_display_power_domain intel_port_to_power_domain(enum port port)
> {
> switch (port) {
> case PORT_A:
> @@ -5589,33 +5589,6 @@ static enum intel_display_power_domain port_to_power_domain(enum port port)
> }
> }
>
> -enum intel_display_power_domain
> -intel_display_port_power_domain(struct intel_encoder *intel_encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);
> - struct intel_digital_port *intel_dig_port;
> -
> - switch (intel_encoder->type) {
> - case INTEL_OUTPUT_UNKNOWN:
> - /* Only DDI platforms should ever use this output type */
> - WARN_ON_ONCE(!HAS_DDI(dev_priv));
> - case INTEL_OUTPUT_DP:
> - case INTEL_OUTPUT_HDMI:
> - case INTEL_OUTPUT_EDP:
> - intel_dig_port = enc_to_dig_port(&intel_encoder->base);
> - return port_to_power_domain(intel_dig_port->port);
> - case INTEL_OUTPUT_DP_MST:
> - intel_dig_port = enc_to_mst(&intel_encoder->base)->primary;
> - return port_to_power_domain(intel_dig_port->port);
> - case INTEL_OUTPUT_ANALOG:
> - return POWER_DOMAIN_PORT_CRT;
> - case INTEL_OUTPUT_DSI:
> - return POWER_DOMAIN_PORT_DSI;
> - default:
> - return POWER_DOMAIN_PORT_OTHER;
> - }
> -}
> -
> static u64 get_crtc_power_domains(struct drm_crtc *crtc,
> struct intel_crtc_state *crtc_state)
> {
> @@ -5639,7 +5612,7 @@ static u64 get_crtc_power_domains(struct drm_crtc *crtc,
> drm_for_each_encoder_mask(encoder, dev, crtc_state->base.encoder_mask) {
> struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
>
> - mask |= BIT_ULL(intel_display_port_power_domain(intel_encoder));
> + mask |= BIT_ULL(intel_encoder->power_domain);
> }
>
> if (HAS_DDI(dev_priv) && crtc_state->has_audio)
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index e2e4766..2e605ad 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2496,12 +2496,11 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,
> enum port port = dp_to_dig_port(intel_dp)->port;
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> - enum intel_display_power_domain power_domain;
> u32 tmp;
> bool ret;
>
> - power_domain = intel_display_port_power_domain(encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder->power_domain))
> return false;
>
> ret = false;
> @@ -2537,7 +2536,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,
> ret = true;
>
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, encoder->power_domain);
>
> return ret;
> }
> @@ -6086,6 +6085,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
> intel_dig_port->max_lanes = 4;
>
> intel_encoder->type = INTEL_OUTPUT_DP;
> + intel_encoder->power_domain = intel_port_to_power_domain(port);
> if (IS_CHERRYVIEW(dev_priv)) {
> if (port == PORT_D)
> intel_encoder->crtc_mask = 1 << 2;
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 6a85d38..d94fd4b 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -548,6 +548,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
> DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));
>
> intel_encoder->type = INTEL_OUTPUT_DP_MST;
> + intel_encoder->power_domain = intel_dig_port->base.power_domain;
> intel_encoder->port = intel_dig_port->port;
> intel_encoder->crtc_mask = 0x7;
> intel_encoder->cloneable = 0;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 3ddeaa6..c8873c0 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -249,6 +249,7 @@ struct intel_encoder {
> void (*suspend)(struct intel_encoder *);
> int crtc_mask;
> enum hpd_pin hpd_pin;
> + enum intel_display_power_domain power_domain;
> /* for communication with audio component; protected by av_mutex */
> const struct drm_connector *audio_connector;
> };
> @@ -1420,8 +1421,7 @@ int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
> bool intel_crtc_active(struct intel_crtc *crtc);
> void hsw_enable_ips(struct intel_crtc *crtc);
> void hsw_disable_ips(struct intel_crtc *crtc);
> -enum intel_display_power_domain
> -intel_display_port_power_domain(struct intel_encoder *intel_encoder);
> +enum intel_display_power_domain intel_port_to_power_domain(enum port port);
> void intel_mode_from_pipe_config(struct drm_display_mode *mode,
> struct intel_crtc_state *pipe_config);
>
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index c98234e..517a943 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -768,14 +768,13 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
> - enum intel_display_power_domain power_domain;
> enum port port;
> bool active = false;
>
> DRM_DEBUG_KMS("\n");
>
> - power_domain = intel_display_port_power_domain(encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder->power_domain))
> return false;
>
> /*
> @@ -831,7 +830,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
> }
>
> out_put_power:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, encoder->power_domain);
>
> return active;
> }
> @@ -1509,6 +1508,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv)
> intel_connector->get_hw_state = intel_connector_get_hw_state;
>
> intel_encoder->port = port;
> +
> /*
> * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI
> * port C. BXT isn't limited like this.
> @@ -1595,6 +1595,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv)
> }
>
> intel_encoder->type = INTEL_OUTPUT_DSI;
> + intel_encoder->power_domain = POWER_DOMAIN_PORT_DSI;
> intel_encoder->cloneable = 0;
> drm_connector_init(dev, connector, &intel_dsi_connector_funcs,
> DRM_MODE_CONNECTOR_DSI);
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 50da89d..6025839 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -515,6 +515,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
> "DVO %c", port_name(port));
>
> intel_encoder->type = INTEL_OUTPUT_DVO;
> + intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
> intel_encoder->port = port;
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index a580de8..c2184f7 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -902,12 +902,11 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
> - enum intel_display_power_domain power_domain;
> u32 tmp;
> bool ret;
>
> - power_domain = intel_display_port_power_domain(encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder->power_domain))
> return false;
>
> ret = false;
> @@ -927,7 +926,7 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
> ret = true;
>
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, encoder->power_domain);
>
> return ret;
> }
> @@ -1981,6 +1980,7 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
> }
>
> intel_encoder->type = INTEL_OUTPUT_HDMI;
> + intel_encoder->power_domain = intel_port_to_power_domain(port);
> intel_encoder->port = port;
> if (IS_CHERRYVIEW(dev_priv)) {
> if (port == PORT_D)
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 9ca4dc4..8b942ef 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -91,12 +91,11 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> - enum intel_display_power_domain power_domain;
> u32 tmp;
> bool ret;
>
> - power_domain = intel_display_port_power_domain(encoder);
> - if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder->power_domain))
> return false;
>
> ret = false;
> @@ -114,7 +113,7 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
> ret = true;
>
> out:
> - intel_display_power_put(dev_priv, power_domain);
> + intel_display_power_put(dev_priv, encoder->power_domain);
>
> return ret;
> }
> @@ -1066,6 +1065,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> intel_connector_attach_encoder(intel_connector, intel_encoder);
>
> intel_encoder->type = INTEL_OUTPUT_LVDS;
> + intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
> intel_encoder->port = PORT_NONE;
> intel_encoder->cloneable = 0;
> if (HAS_PCH_SPLIT(dev_priv))
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 2ad1390..816a6f5 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2981,6 +2981,7 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
> /* encoder type will be decided later */
> intel_encoder = &intel_sdvo->base;
> intel_encoder->type = INTEL_OUTPUT_SDVO;
> + intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
> intel_encoder->port = port;
> drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
> &intel_sdvo_enc_funcs, 0,
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index eb692e4..6ed1a3c 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1621,6 +1621,7 @@ intel_tv_init(struct drm_i915_private *dev_priv)
> intel_connector_attach_encoder(intel_connector, intel_encoder);
>
> intel_encoder->type = INTEL_OUTPUT_TVOUT;
> + intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
> intel_encoder->port = PORT_NONE;
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
> intel_encoder->cloneable = 0;
> --
> 2.9.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
