On Fri, 2018-11-02 at 13:47 +0200, Jani Nikula wrote:
> From: Madhav Chauhan <madhav.chau...@intel.com>
>
> This patch read out the current hw state for DSI and
> return true if encoder is active.
>
> v2 by Jani:
> - Squash connector get hw state hook here
> - Squash encode get hw state fix here
>
> v3 by Jani:
> - Add encoder->get_power_domains() (Imre)
>
> v4 by Jani:
> - Make encoder->get_power_domains() sensible... (Imre)
>
> Cc: Imre Deak <imre.d...@intel.com>
> Signed-off-by: Madhav Chauhan <madhav.chau...@intel.com>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
> ---
> drivers/gpu/drm/i915/icl_dsi.c | 57
> ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/icl_dsi.c
> b/drivers/gpu/drm/i915/icl_dsi.c
> index b47e837f4493..1881825432cb 100644
> --- a/drivers/gpu/drm/i915/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/icl_dsi.c
> @@ -1068,6 +1068,60 @@ static void gen11_dsi_get_config(struct
> intel_encoder *encoder,
> pipe_config->port_clock = pixel_clk;
> }
>
> +static u64 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)
> + domains |= (port == PORT_A ?
> POWER_DOMAIN_PORT_DDI_A_IO :
> + POWER_DOMAIN_PORT_DDI_B_IO);
After investigating this with Imre, we found that this should be:
for_each_dsi_port(port, intel_dsi->ports)
domains |= (port == PORT_A ? BIT(POWER_DOMAIN_PORT_DDI_A_IO) :
BIT(POWER_DOMAIN_PORT_DDI_B_IO));
As POWER_DOMAIN_PORT_DDI_A_IO and POWER_DOMAIN_PORT_DDI_B_IO are actual
enum values, not bit positions. Otherwise we are getting garbage in
returned domains and dmesg warnings regarding power wells.
With those fixed, at least power well dmesg warnings are gone.
> +
> + return domains;
> +}
> +
> +static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,
> + enum pipe *pipe)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder-
> >base.dev);
> + struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder-
> >base);
> + u32 tmp;
> + enum port port;
> + enum transcoder dsi_trans;
> + bool ret = false;
> +
> + if (!intel_display_power_get_if_enabled(dev_priv,
> + encoder-
> >power_domain))
> + return false;
> +
> + for_each_dsi_port(port, intel_dsi->ports) {
> + dsi_trans = dsi_port_to_transcoder(port);
> + tmp = I915_READ(TRANS_DDI_FUNC_CTL(dsi_trans));
> + switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
> + case TRANS_DDI_EDP_INPUT_A_ON:
> + *pipe = PIPE_A;
> + break;
> + case TRANS_DDI_EDP_INPUT_B_ONOFF:
> + *pipe = PIPE_B;
> + break;
> + case TRANS_DDI_EDP_INPUT_C_ONOFF:
> + *pipe = PIPE_C;
> + break;
> + default:
> + DRM_ERROR("Invalid PIPE input\n");
> + goto out;
> + }
> +
> + tmp = I915_READ(PIPECONF(dsi_trans));
> + ret = tmp & PIPECONF_ENABLE;
> + }
> +out:
> + intel_display_power_put(dev_priv, encoder->power_domain);
> + return ret;
> +}
> +
> static void gen11_dsi_encoder_destroy(struct drm_encoder *encoder)
> {
> intel_encoder_destroy(encoder);
> @@ -1181,10 +1235,12 @@ void icl_dsi_init(struct drm_i915_private
> *dev_priv)
> encoder->disable = gen11_dsi_disable;
> encoder->port = port;
> encoder->get_config = gen11_dsi_get_config;
> + encoder->get_hw_state = gen11_dsi_get_hw_state;
> encoder->type = INTEL_OUTPUT_DSI;
> encoder->cloneable = 0;
> encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) |
> BIT(PIPE_C);
> encoder->power_domain = POWER_DOMAIN_PORT_DSI;
> + encoder->get_power_domains = gen11_dsi_get_power_domains;
>
> /* register DSI connector with DRM subsystem */
> drm_connector_init(dev, connector,
> &gen11_dsi_connector_funcs,
> @@ -1193,6 +1249,7 @@ void icl_dsi_init(struct drm_i915_private
> *dev_priv)
> connector->display_info.subpixel_order =
> SubPixelHorizontalRGB;
> connector->interlace_allowed = false;
> connector->doublescan_allowed = false;
> + intel_connector->get_hw_state =
> intel_connector_get_hw_state;
>
> /* attach connector to encoder */
> intel_connector_attach_encoder(intel_connector, encoder);
--
Best Regards,
Lisovskiy Stanislav
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
