On Wed, Mar 11, 2020 at 05:54:20PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Let's get rid of the platform if ladders in
> intel_digital_port_connected() and make it a vfunc. Now the if
> ladders are at the encoder initialization which makes them a bit
> less convoluted.
>
> v2: Add forward decl for intel_encoder in intel_tc.h
> v3: Duplicate stuff to avoid exposing platform specific
> functions across files (Jani)
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Nice to see the CPU and PCH handlers in their own vfunc:
Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
nit: Looks like you could've also added mcc_digital_port_connected() for
PHY_C.
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 109 +++++++++++++
> .../drm/i915/display/intel_display_types.h | 1 +
> drivers/gpu/drm/i915/display/intel_dp.c | 147 +++---------------
> drivers/gpu/drm/i915/display/intel_tc.c | 3 +-
> drivers/gpu/drm/i915/display/intel_tc.h | 3 +-
> 5 files changed, 135 insertions(+), 128 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 73d0f4648c06..c8ceb08f8d05 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -4343,6 +4343,96 @@ intel_ddi_hotplug(struct intel_encoder *encoder,
> return state;
> }
>
> +static bool lpt_digital_port_connected(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + u32 bit;
> +
> + switch (encoder->hpd_pin) {
> + case HPD_PORT_B:
> + bit = SDE_PORTB_HOTPLUG_CPT;
> + break;
> + case HPD_PORT_C:
> + bit = SDE_PORTC_HOTPLUG_CPT;
> + break;
> + case HPD_PORT_D:
> + bit = SDE_PORTD_HOTPLUG_CPT;
> + break;
> + default:
> + MISSING_CASE(encoder->hpd_pin);
> + return false;
> + }
> +
> + return intel_de_read(dev_priv, SDEISR) & bit;
> +}
> +
> +static bool spt_digital_port_connected(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + u32 bit;
> +
> + switch (encoder->hpd_pin) {
> + case HPD_PORT_A:
> + bit = SDE_PORTA_HOTPLUG_SPT;
> + break;
> + case HPD_PORT_E:
> + bit = SDE_PORTE_HOTPLUG_SPT;
> + break;
> + default:
> + return lpt_digital_port_connected(encoder);
> + }
> +
> + return intel_de_read(dev_priv, SDEISR) & bit;
> +}
> +
> +static bool hsw_digital_port_connected(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> +
> + return intel_de_read(dev_priv, DEISR) & DE_DP_A_HOTPLUG_IVB;
> +}
> +
> +static bool bdw_digital_port_connected(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> +
> + return intel_de_read(dev_priv, GEN8_DE_PORT_ISR) & GEN8_PORT_DP_A_HOTPLUG;
> +}
> +
> +static bool bxt_digital_port_connected(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + u32 bit;
> +
> + switch (encoder->hpd_pin) {
> + case HPD_PORT_A:
> + bit = BXT_DE_PORT_HP_DDIA;
> + break;
> + case HPD_PORT_B:
> + bit = BXT_DE_PORT_HP_DDIB;
> + break;
> + case HPD_PORT_C:
> + bit = BXT_DE_PORT_HP_DDIC;
> + break;
> + default:
> + MISSING_CASE(encoder->hpd_pin);
> + return false;
> + }
> +
> + return intel_de_read(dev_priv, GEN8_DE_PORT_ISR) & bit;
> +}
> +
> +static bool icp_digital_port_connected(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
> +
> + if (HAS_PCH_MCC(dev_priv) && phy == PHY_C)
> + return intel_de_read(dev_priv, SDEISR) & SDE_TC_HOTPLUG_ICP(PORT_TC1);
> +
> + return intel_de_read(dev_priv, SDEISR) & SDE_DDI_HOTPLUG_ICP(phy);
> +}
> +
> static struct intel_connector *
> intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)
> {
> @@ -4534,6 +4624,25 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> port_name(port));
> }
>
> + if (INTEL_GEN(dev_priv) >= 11) {
> + if (intel_phy_is_tc(dev_priv, phy))
> + intel_dig_port->connected = intel_tc_port_connected;
> + else
> + intel_dig_port->connected = icp_digital_port_connected;
> + } else if (IS_GEN9_LP(dev_priv)) {
> + intel_dig_port->connected = bxt_digital_port_connected;
> + } else if (port == PORT_A) {
> + if (INTEL_GEN(dev_priv) >= 8)
> + intel_dig_port->connected = bdw_digital_port_connected;
> + else
> + intel_dig_port->connected = hsw_digital_port_connected;
> + } else {
> + if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
> + intel_dig_port->connected = spt_digital_port_connected;
> + else
> + intel_dig_port->connected = lpt_digital_port_connected;
> + }
> +
> intel_infoframe_init(intel_dig_port);
>
> return;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 5e00e611f077..3aab12f69ff8 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1401,6 +1401,7 @@ struct intel_digital_port {
> const struct drm_connector_state *conn_state);
> u32 (*infoframes_enabled)(struct intel_encoder *encoder,
> const struct intel_crtc_state *pipe_config);
> + bool (*connected)(struct intel_encoder *encoder);
> };
>
> struct intel_dp_mst_encoder {
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 0a417cd2af2b..cff14f52c391 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5447,25 +5447,6 @@ static bool cpt_digital_port_connected(struct intel_encoder *encoder)
> return intel_de_read(dev_priv, SDEISR) & bit;
> }
>
> -static bool spt_digital_port_connected(struct intel_encoder *encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - u32 bit;
> -
> - switch (encoder->hpd_pin) {
> - case HPD_PORT_A:
> - bit = SDE_PORTA_HOTPLUG_SPT;
> - break;
> - case HPD_PORT_E:
> - bit = SDE_PORTE_HOTPLUG_SPT;
> - break;
> - default:
> - return cpt_digital_port_connected(encoder);
> - }
> -
> - return intel_de_read(dev_priv, SDEISR) & bit;
> -}
> -
> static bool g4x_digital_port_connected(struct intel_encoder *encoder)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> @@ -5516,88 +5497,14 @@ static bool ilk_digital_port_connected(struct intel_encoder *encoder)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>
> - if (encoder->hpd_pin == HPD_PORT_A)
> - return intel_de_read(dev_priv, DEISR) & DE_DP_A_HOTPLUG;
> - else
> - return ibx_digital_port_connected(encoder);
> -}
> -
> -static bool snb_digital_port_connected(struct intel_encoder *encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> -
> - if (encoder->hpd_pin == HPD_PORT_A)
> - return intel_de_read(dev_priv, DEISR) & DE_DP_A_HOTPLUG;
> - else
> - return cpt_digital_port_connected(encoder);
> + return intel_de_read(dev_priv, DEISR) & DE_DP_A_HOTPLUG;
> }
>
> static bool ivb_digital_port_connected(struct intel_encoder *encoder)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>
> - if (encoder->hpd_pin == HPD_PORT_A)
> - return intel_de_read(dev_priv, DEISR) & DE_DP_A_HOTPLUG_IVB;
> - else
> - return cpt_digital_port_connected(encoder);
> -}
> -
> -static bool bdw_digital_port_connected(struct intel_encoder *encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> -
> - if (encoder->hpd_pin == HPD_PORT_A)
> - return intel_de_read(dev_priv, GEN8_DE_PORT_ISR) & GEN8_PORT_DP_A_HOTPLUG;
> - else
> - return cpt_digital_port_connected(encoder);
> -}
> -
> -static bool bxt_digital_port_connected(struct intel_encoder *encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - u32 bit;
> -
> - switch (encoder->hpd_pin) {
> - case HPD_PORT_A:
> - bit = BXT_DE_PORT_HP_DDIA;
> - break;
> - case HPD_PORT_B:
> - bit = BXT_DE_PORT_HP_DDIB;
> - break;
> - case HPD_PORT_C:
> - bit = BXT_DE_PORT_HP_DDIC;
> - break;
> - default:
> - MISSING_CASE(encoder->hpd_pin);
> - return false;
> - }
> -
> - return intel_de_read(dev_priv, GEN8_DE_PORT_ISR) & bit;
> -}
> -
> -static bool intel_combo_phy_connected(struct drm_i915_private *dev_priv,
> - enum phy phy)
> -{
> - if (HAS_PCH_MCC(dev_priv) && phy == PHY_C)
> - return intel_de_read(dev_priv, SDEISR) & SDE_TC_HOTPLUG_ICP(PORT_TC1);
> -
> - return intel_de_read(dev_priv, SDEISR) & SDE_DDI_HOTPLUG_ICP(phy);
> -}
> -
> -static bool icp_digital_port_connected(struct intel_encoder *encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
> - enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
> -
> - if (intel_phy_is_combo(dev_priv, phy))
> - return intel_combo_phy_connected(dev_priv, phy);
> - else if (intel_phy_is_tc(dev_priv, phy))
> - return intel_tc_port_connected(dig_port);
> - else
> - MISSING_CASE(encoder->hpd_pin);
> -
> - return false;
> + return intel_de_read(dev_priv, DEISR) & DE_DP_A_HOTPLUG_IVB;
> }
>
> /*
> @@ -5611,44 +5518,15 @@ static bool icp_digital_port_connected(struct intel_encoder *encoder)
> *
> * Return %true if port is connected, %false otherwise.
> */
> -static bool __intel_digital_port_connected(struct intel_encoder *encoder)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> -
> - if (HAS_GMCH(dev_priv)) {
> - if (IS_GM45(dev_priv))
> - return gm45_digital_port_connected(encoder);
> - else
> - return g4x_digital_port_connected(encoder);
> - }
> -
> - if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
> - return icp_digital_port_connected(encoder);
> - else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
> - return spt_digital_port_connected(encoder);
> - else if (IS_GEN9_LP(dev_priv))
> - return bxt_digital_port_connected(encoder);
> - else if (IS_GEN(dev_priv, 8))
> - return bdw_digital_port_connected(encoder);
> - else if (IS_GEN(dev_priv, 7))
> - return ivb_digital_port_connected(encoder);
> - else if (IS_GEN(dev_priv, 6))
> - return snb_digital_port_connected(encoder);
> - else if (IS_GEN(dev_priv, 5))
> - return ilk_digital_port_connected(encoder);
> -
> - MISSING_CASE(INTEL_GEN(dev_priv));
> - return false;
> -}
> -
> bool intel_digital_port_connected(struct intel_encoder *encoder)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
> bool is_connected = false;
> intel_wakeref_t wakeref;
>
> with_intel_display_power(dev_priv, POWER_DOMAIN_DISPLAY_CORE, wakeref)
> - is_connected = __intel_digital_port_connected(encoder);
> + is_connected = dig_port->connected(encoder);
>
> return is_connected;
> }
> @@ -7852,6 +7730,23 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
>
> intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
>
> + if (HAS_GMCH(dev_priv)) {
> + if (IS_GM45(dev_priv))
> + intel_dig_port->connected = gm45_digital_port_connected;
> + else
> + intel_dig_port->connected = g4x_digital_port_connected;
> + } else if (port == PORT_A) {
> + if (IS_IVYBRIDGE(dev_priv))
> + intel_dig_port->connected = ivb_digital_port_connected;
> + else
> + intel_dig_port->connected = ilk_digital_port_connected;
> + } else {
> + if (HAS_PCH_CPT(dev_priv))
> + intel_dig_port->connected = cpt_digital_port_connected;
> + else
> + intel_dig_port->connected = ibx_digital_port_connected;
> + }
> +
> if (port != PORT_A)
> intel_infoframe_init(intel_dig_port);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index 9b850c11aa78..1e64b4c92eec 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -484,8 +484,9 @@ static bool intel_tc_port_needs_reset(struct intel_digital_port *dig_port)
> * connected ports are usable, and avoids exposing to the users objects they
> * can't really use.
> */
> -bool intel_tc_port_connected(struct intel_digital_port *dig_port)
> +bool intel_tc_port_connected(struct intel_encoder *encoder)
> {
> + struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
> bool is_connected;
>
> intel_tc_port_lock(dig_port);
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.h b/drivers/gpu/drm/i915/display/intel_tc.h
> index 463f1b3c836f..b619e4736f85 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.h
> +++ b/drivers/gpu/drm/i915/display/intel_tc.h
> @@ -10,8 +10,9 @@
> #include <linux/types.h>
>
> struct intel_digital_port;
> +struct intel_encoder;
>
> -bool intel_tc_port_connected(struct intel_digital_port *dig_port);
> +bool intel_tc_port_connected(struct intel_encoder *encoder);
> u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port);
> u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port);
> int intel_tc_port_fia_max_lane_count(struct intel_digital_port *dig_port);
> --
> 2.24.1
>
> _______________________________________________
> 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
