[03/17] drm/i915: Introduce <platoform>_hotplug_mask()

Message ID	20230220174448.7611-4-ville.syrjala@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: Ville Syrjala <ville.syrjala@linux.intel.com> To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Feb 2023 19:44:34 +0200 Message-Id: <20230220174448.7611-4-ville.syrjala@linux.intel.com> In-Reply-To: <20230220174448.7611-1-ville.syrjala@linux.intel.com> References: <20230220174448.7611-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH 03/17] drm/i915: Introduce <platoform>_hotplug_mask() Precedence: list Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	drm/i915: Init DDI ports in VBT order \| expand [00/17] drm/i915: Init DDI ports in VBT order [01/17] drm/i915: Populate dig_port->connected() before connector init [02/17] drm/i915: Get rid of the gm45 HPD live state nonsense [03/17] drm/i915: Introduce <platoform>_hotplug_mask() [04/17] drm/i915: Introduce intel_hpd_detection() [05/17] drm/i915: Check HPD live state during eDP probe [06/17] drm/i915: Sanitize child devices later [07/17] drm/i915: Split map_aux_ch() into per-platform arrays [08/17] drm/i915: Flip VBT DDC pin maps around [09/17] drm/i915: Nuke intel_bios_is_port_dp_dual_mode() [10/17] drm/i915: Remove bogus DDI-F from hsw/bdw output init [11/17] drm/i915: Introduce device info port_mask [12/17] drm/i915: Assert that device info bitmasks have enough bits [13/17] drm/i915: Assert that the port being initialized is valid [14/17] drm/i915: Beef up SDVO/HDMI port checks [15/17] drm/i915: Init DDI outputs based on port_mask on skl+ [16/17] drm/i915: Try to initialize DDI/ICL+ DSI ports for every VBT child device [17/17] drm/i915: Convert HSW/BDW to use VBT driven DDI probe

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b024a3a7ca19..340d2226f9a4 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2833,8 +2833,25 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv) vlv_display_irq_reset(dev_priv); spin_unlock_irq(&dev_priv->irq_lock); } +static u32 ibx_hotplug_mask(struct drm_i915_private *i915, + enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { + case HPD_PORT_A: + return PORTA_HOTPLUG_ENABLE; + case HPD_PORT_B: + return PORTB_HOTPLUG_ENABLE | PORTB_PULSE_DURATION_MASK; + case HPD_PORT_C: + return PORTC_HOTPLUG_ENABLE | PORTC_PULSE_DURATION_MASK; + case HPD_PORT_D: + return PORTD_HOTPLUG_ENABLE | PORTD_PULSE_DURATION_MASK; + default: + return 0; + } +} + static u32 ibx_hotplug_enables(struct intel_encoder *encoder) { struct drm_i915_private *i915 = to_i915(encoder->base.dev); @@ -2867,15 +2884,12 @@ static void ibx_hpd_detection_setup(struct drm_i915_private *dev_priv) * duration to 2ms (which is the minimum in the Display Port spec). * The pulse duration bits are reserved on LPT+. */ intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG, - PORTA_HOTPLUG_ENABLE | - PORTB_HOTPLUG_ENABLE | - PORTC_HOTPLUG_ENABLE | - PORTD_HOTPLUG_ENABLE | - PORTB_PULSE_DURATION_MASK | - PORTC_PULSE_DURATION_MASK | - PORTD_PULSE_DURATION_MASK, + ibx_hotplug_mask(dev_priv, HPD_PORT_A) | + ibx_hotplug_mask(dev_priv, HPD_PORT_B) | + ibx_hotplug_mask(dev_priv, HPD_PORT_C) | + ibx_hotplug_mask(dev_priv, HPD_PORT_D), intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables)); } static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv) @@ -2889,55 +2903,75 @@ static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv) ibx_hpd_detection_setup(dev_priv); } +static u32 _icp_ddi_hotplug_enables(enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { + case HPD_PORT_A: + case HPD_PORT_B: + case HPD_PORT_C: + case HPD_PORT_D: + return SHOTPLUG_CTL_DDI_HPD_ENABLE(hpd_pin); + default: + return 0; + } +} + +static u32 icp_ddi_hotplug_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) +{ + return _icp_ddi_hotplug_enables(hpd_pin); +} + static u32 icp_ddi_hotplug_enables(struct intel_encoder *encoder) { - switch (encoder->hpd_pin) { - case HPD_PORT_A: - case HPD_PORT_B: - case HPD_PORT_C: - case HPD_PORT_D: - return SHOTPLUG_CTL_DDI_HPD_ENABLE(encoder->hpd_pin); + return _icp_ddi_hotplug_enables(encoder->hpd_pin); +} + +static u32 _icp_tc_hotplug_enables(enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { + case HPD_PORT_TC1: + case HPD_PORT_TC2: + case HPD_PORT_TC3: + case HPD_PORT_TC4: + case HPD_PORT_TC5: + case HPD_PORT_TC6: + return ICP_TC_HPD_ENABLE(hpd_pin); default: return 0; } } +static u32 icp_tc_hotplug_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) +{ + return _icp_tc_hotplug_enables(hpd_pin); +} + static u32 icp_tc_hotplug_enables(struct intel_encoder *encoder) { - switch (encoder->hpd_pin) { - case HPD_PORT_TC1: - case HPD_PORT_TC2: - case HPD_PORT_TC3: - case HPD_PORT_TC4: - case HPD_PORT_TC5: - case HPD_PORT_TC6: - return ICP_TC_HPD_ENABLE(encoder->hpd_pin); - default: - return 0; - } + return _icp_tc_hotplug_enables(encoder->hpd_pin); } static void icp_ddi_hpd_detection_setup(struct drm_i915_private *dev_priv) { intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_DDI, - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_A) | - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_B) | - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_C) | - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_D), + icp_ddi_hotplug_mask(dev_priv, HPD_PORT_A) | + icp_ddi_hotplug_mask(dev_priv, HPD_PORT_B) | + icp_ddi_hotplug_mask(dev_priv, HPD_PORT_C) | + icp_ddi_hotplug_mask(dev_priv, HPD_PORT_D), intel_hpd_hotplug_enables(dev_priv, icp_ddi_hotplug_enables)); } static void icp_tc_hpd_detection_setup(struct drm_i915_private *dev_priv) { intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_TC, - ICP_TC_HPD_ENABLE(HPD_PORT_TC1) | - ICP_TC_HPD_ENABLE(HPD_PORT_TC2) | - ICP_TC_HPD_ENABLE(HPD_PORT_TC3) | - ICP_TC_HPD_ENABLE(HPD_PORT_TC4) | - ICP_TC_HPD_ENABLE(HPD_PORT_TC5) | - ICP_TC_HPD_ENABLE(HPD_PORT_TC6), + icp_tc_hotplug_mask(dev_priv, HPD_PORT_TC1) | + icp_tc_hotplug_mask(dev_priv, HPD_PORT_TC2) | + icp_tc_hotplug_mask(dev_priv, HPD_PORT_TC3) | + icp_tc_hotplug_mask(dev_priv, HPD_PORT_TC4) | + icp_tc_hotplug_mask(dev_priv, HPD_PORT_TC5) | + icp_tc_hotplug_mask(dev_priv, HPD_PORT_TC6), intel_hpd_hotplug_enables(dev_priv, icp_tc_hotplug_enables)); } static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv) @@ -2955,21 +2989,31 @@ static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv) icp_ddi_hpd_detection_setup(dev_priv); icp_tc_hpd_detection_setup(dev_priv); } +static u32 _gen11_hotplug_enables(enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { + case HPD_PORT_TC1: + case HPD_PORT_TC2: + case HPD_PORT_TC3: + case HPD_PORT_TC4: + case HPD_PORT_TC5: + case HPD_PORT_TC6: + return GEN11_HOTPLUG_CTL_ENABLE(hpd_pin); + default: + return 0; + } +} + +static u32 gen11_hotplug_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) +{ + return _gen11_hotplug_enables(hpd_pin); +} + static u32 gen11_hotplug_enables(struct intel_encoder *encoder) { - switch (encoder->hpd_pin) { - case HPD_PORT_TC1: - case HPD_PORT_TC2: - case HPD_PORT_TC3: - case HPD_PORT_TC4: - case HPD_PORT_TC5: - case HPD_PORT_TC6: - return GEN11_HOTPLUG_CTL_ENABLE(encoder->hpd_pin); - default: - return 0; - } + return _gen11_hotplug_enables(encoder->hpd_pin); } static void dg1_hpd_invert(struct drm_i915_private *i915) { @@ -2988,26 +3032,26 @@ static void dg1_hpd_irq_setup(struct drm_i915_private *dev_priv) static void gen11_tc_hpd_detection_setup(struct drm_i915_private *dev_priv) { intel_uncore_rmw(&dev_priv->uncore, GEN11_TC_HOTPLUG_CTL, - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC1) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC2) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC3) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC4) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC5) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC6), + gen11_hotplug_mask(dev_priv, HPD_PORT_TC1) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC2) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC3) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC4) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC5) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC6), intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables)); } static void gen11_tbt_hpd_detection_setup(struct drm_i915_private *dev_priv) { intel_uncore_rmw(&dev_priv->uncore, GEN11_TBT_HOTPLUG_CTL, - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC1) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC2) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC3) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC4) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC5) | - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC6), + gen11_hotplug_mask(dev_priv, HPD_PORT_TC1) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC2) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC3) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC4) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC5) | + gen11_hotplug_mask(dev_priv, HPD_PORT_TC6), intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables)); } static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) @@ -3027,11 +3071,11 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) icp_hpd_irq_setup(dev_priv); } -static u32 spt_hotplug_enables(struct intel_encoder *encoder) +static u32 _spt_hotplug_enables(enum hpd_pin hpd_pin) { - switch (encoder->hpd_pin) { + switch (hpd_pin) { case HPD_PORT_A: return PORTA_HOTPLUG_ENABLE; case HPD_PORT_B: return PORTB_HOTPLUG_ENABLE; @@ -3043,18 +3087,38 @@ static u32 spt_hotplug_enables(struct intel_encoder *encoder) return 0; } } -static u32 spt_hotplug2_enables(struct intel_encoder *encoder) +static u32 spt_hotplug_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) { - switch (encoder->hpd_pin) { + return _spt_hotplug_enables(hpd_pin); +} + +static u32 spt_hotplug_enables(struct intel_encoder *encoder) +{ + return _spt_hotplug_enables(encoder->hpd_pin); +} + +static u32 _spt_hotplug2_enables(enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { case HPD_PORT_E: return PORTE_HOTPLUG_ENABLE; default: return 0; } } +static u32 spt_hotplug2_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) +{ + return _spt_hotplug2_enables(hpd_pin); +} + +static u32 spt_hotplug2_enables(struct intel_encoder *encoder) +{ + return _spt_hotplug2_enables(encoder->hpd_pin); +} + static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv) { /* Display WA #1179 WaHardHangonHotPlug: cnp */ if (HAS_PCH_CNP(dev_priv)) { @@ -3063,15 +3127,16 @@ static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv) } /* Enable digital hotplug on the PCH */ intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG, - PORTA_HOTPLUG_ENABLE | - PORTB_HOTPLUG_ENABLE | - PORTC_HOTPLUG_ENABLE | - PORTD_HOTPLUG_ENABLE, + spt_hotplug_mask(dev_priv, HPD_PORT_A) | + spt_hotplug_mask(dev_priv, HPD_PORT_B) | + spt_hotplug_mask(dev_priv, HPD_PORT_C) | + spt_hotplug_mask(dev_priv, HPD_PORT_D), intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables)); - intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2, PORTE_HOTPLUG_ENABLE, + intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2, + spt_hotplug2_mask(dev_priv, HPD_PORT_E), intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables)); } static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv) @@ -3088,8 +3153,19 @@ static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv) spt_hpd_detection_setup(dev_priv); } +static u32 ilk_hotplug_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { + case HPD_PORT_A: + return DIGITAL_PORTA_HOTPLUG_ENABLE | + DIGITAL_PORTA_PULSE_DURATION_MASK; + default: + return 0; + } +} + static u32 ilk_hotplug_enables(struct intel_encoder *encoder) { switch (encoder->hpd_pin) { case HPD_PORT_A: @@ -3107,9 +3183,9 @@ static void ilk_hpd_detection_setup(struct drm_i915_private *dev_priv) * duration to 2ms (which is the minimum in the Display Port spec) * The pulse duration bits are reserved on HSW+. */ intel_uncore_rmw(&dev_priv->uncore, DIGITAL_PORT_HOTPLUG_CNTRL, - DIGITAL_PORTA_HOTPLUG_ENABLE | DIGITAL_PORTA_PULSE_DURATION_MASK, + ilk_hotplug_mask(dev_priv, HPD_PORT_A), intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables)); } static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv) @@ -3128,8 +3204,22 @@ static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv) ibx_hpd_irq_setup(dev_priv); } +static u32 bxt_hotplug_mask(struct drm_i915_private *i915, enum hpd_pin hpd_pin) +{ + switch (hpd_pin) { + case HPD_PORT_A: + return PORTA_HOTPLUG_ENABLE | BXT_DDIA_HPD_INVERT; + case HPD_PORT_B: + return PORTB_HOTPLUG_ENABLE | BXT_DDIB_HPD_INVERT; + case HPD_PORT_C: + return PORTC_HOTPLUG_ENABLE | BXT_DDIC_HPD_INVERT; + default: + return 0; + } +} + static u32 bxt_hotplug_enables(struct intel_encoder *encoder) { u32 hotplug; @@ -3156,12 +3246,11 @@ static u32 bxt_hotplug_enables(struct intel_encoder *encoder) static void bxt_hpd_detection_setup(struct drm_i915_private *dev_priv) { intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG, - PORTA_HOTPLUG_ENABLE | - PORTB_HOTPLUG_ENABLE | - PORTC_HOTPLUG_ENABLE | - BXT_DDI_HPD_INVERT_MASK, + bxt_hotplug_mask(dev_priv, HPD_PORT_A) | + bxt_hotplug_mask(dev_priv, HPD_PORT_B) | + bxt_hotplug_mask(dev_priv, HPD_PORT_C), intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables)); } static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)

[03/17] drm/i915: Introduce <platoform>_hotplug_mask()

Commit Message

Patch