From: Ville Syrjälä <[email protected]> Get rid of several platform specific variants of intel_digital_port_connected() and just use the ISR bits we've stashed away.
Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_ddi.c | 16 ++- drivers/gpu/drm/i915/display/intel_dp.c | 121 ++--------------------- drivers/gpu/drm/i915/display/intel_dp.h | 7 +- drivers/gpu/drm/i915/display/intel_tc.c | 4 +- 4 files changed, 21 insertions(+), 127 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index d983860560cf..30ae97ee6d72 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4894,19 +4894,17 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 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 = pch_digital_port_connected; + } else if (INTEL_GEN(dev_priv) >= 8) { + if (port == PORT_A || IS_GEN9_LP(dev_priv)) intel_dig_port->connected = bdw_digital_port_connected; else - intel_dig_port->connected = ivb_digital_port_connected; + intel_dig_port->connected = pch_digital_port_connected; } else { - if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) - intel_dig_port->connected = spt_digital_port_connected; + if (port == PORT_A) + intel_dig_port->connected = ilk_digital_port_connected; else - intel_dig_port->connected = cpt_digital_port_connected; + intel_dig_port->connected = pch_digital_port_connected; } intel_infoframe_init(intel_dig_port); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 4e1f73f80951..ac767be18df0 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5348,71 +5348,6 @@ edp_detect(struct intel_dp *intel_dp) return connector_status_connected; } -static bool ibx_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; - break; - case HPD_PORT_C: - bit = SDE_PORTC_HOTPLUG; - break; - case HPD_PORT_D: - bit = SDE_PORTD_HOTPLUG; - break; - default: - MISSING_CASE(encoder->hpd_pin); - return false; - } - - return I915_READ(SDEISR) & bit; -} - -bool cpt_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 I915_READ(SDEISR) & bit; -} - -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 I915_READ(SDEISR) & bit; -} - static bool g4x_digital_port_connected(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -5459,59 +5394,28 @@ static bool gm45_digital_port_connected(struct intel_encoder *encoder) return I915_READ(PORT_HOTPLUG_STAT) & bit; } -static bool ilk_digital_port_connected(struct intel_encoder *encoder) +bool ilk_digital_port_connected(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin]; - return I915_READ(DEISR) & DE_DP_A_HOTPLUG; -} - -bool ivb_digital_port_connected(struct intel_encoder *encoder) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - return I915_READ(DEISR) & DE_DP_A_HOTPLUG_IVB; + return I915_READ(DEISR) & bit; } bool bdw_digital_port_connected(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - return I915_READ(GEN8_DE_PORT_ISR) & GEN8_PORT_DP_A_HOTPLUG; -} - -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; - } + u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin]; return I915_READ(GEN8_DE_PORT_ISR) & bit; } -bool icp_digital_port_connected(struct intel_encoder *encoder) +bool pch_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); + u32 bit = dev_priv->hotplug.pch_hpd[encoder->hpd_pin]; - if (HAS_PCH_MCC(dev_priv) && phy == PHY_C) - return I915_READ(SDEISR) & SDE_TC_HOTPLUG_ICP(PORT_TC1); - - return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(phy); + return I915_READ(SDEISR) & bit; } /* @@ -7577,16 +7481,11 @@ bool intel_dp_init(struct drm_i915_private *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 + } else { + if (port == PORT_A) 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; + intel_dig_port->connected = pch_digital_port_connected; } if (port != PORT_A) diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index cf0df6f18734..1b0b524cdc64 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -116,12 +116,9 @@ void intel_dp_vsc_enable(struct intel_dp *intel_dp, void intel_dp_hdr_metadata_enable(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state); -bool cpt_digital_port_connected(struct intel_encoder *encoder); -bool spt_digital_port_connected(struct intel_encoder *encoder); -bool ivb_digital_port_connected(struct intel_encoder *encoder); +bool pch_digital_port_connected(struct intel_encoder *encoder); +bool ilk_digital_port_connected(struct intel_encoder *encoder); bool bdw_digital_port_connected(struct intel_encoder *encoder); -bool bxt_digital_port_connected(struct intel_encoder *encoder); -bool icp_digital_port_connected(struct intel_encoder *encoder); bool intel_digital_port_connected(struct intel_encoder *encoder); static inline unsigned int intel_dp_unused_lane_mask(int lane_count) diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index f498076b132c..7223db87a143 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -172,8 +172,8 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port, static u32 tc_port_live_status_mask(struct intel_digital_port *dig_port) { struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); - enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port); struct intel_uncore *uncore = &i915->uncore; + u32 isr_bit = i915->hotplug.pch_hpd[dig_port->base.hpd_pin]; u32 mask = 0; u32 val; @@ -191,7 +191,7 @@ static u32 tc_port_live_status_mask(struct intel_digital_port *dig_port) if (val & TC_LIVE_STATE_TC(dig_port->tc_phy_fia_idx)) mask |= BIT(TC_PORT_DP_ALT); - if (intel_uncore_read(uncore, SDEISR) & SDE_TC_HOTPLUG_ICP(tc_port)) + if (intel_uncore_read(uncore, SDEISR) & isr_bit) mask |= BIT(TC_PORT_LEGACY); /* The sink can be connected only in a single mode. */ -- 2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
