Re: [Intel-gfx] [PATCH v6] drm/i915: Init lspcon after HPD in intel_dp_detect()
On Wed, Jun 10, 2020 at 03:55:10PM +0800, Kai-Heng Feng wrote: > On HP 800 G4 DM, if HDMI cable isn't plugged before boot, the HDMI port > becomes useless and never responds to cable hotplugging: > [3.031904] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon > [3.031945] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on port > D > > Seems like the lspcon chip on the system only gets powered after the > cable is plugged. > > Consilidate lspcon_init() into lspcon_resume() to dynamically init > lspcon chip, and make HDMI port work. > > Signed-off-by: Kai-Heng Feng > --- > v6: > - Rebase on latest for-linux-next. > > v5: > - Consolidate lspcon_resume() with lspcon_init(). > - Move more logic into lspcon code. > > v4: > - Trust VBT in intel_infoframe_init(). > - Init lspcon in intel_dp_detect(). > > v3: > - Make sure it's handled under long HPD case. > > v2: > - Move lspcon_init() inside of intel_dp_hpd_pulse(). Hoisted the changelog above --- where it belongs in drm land, amended with Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/203 and pushed the patch to dinq. Thanks, and sorry for the horrendous latency. PS. This will cause some headache for Uma's lspcon HDR stuff, but so be it. > > drivers/gpu/drm/i915/display/intel_ddi.c| 19 +-- > drivers/gpu/drm/i915/display/intel_dp.c | 10 ++-- > drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- > drivers/gpu/drm/i915/display/intel_lspcon.c | 63 - > drivers/gpu/drm/i915/display/intel_lspcon.h | 3 +- > 5 files changed, 43 insertions(+), 55 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index aa22465bb56e..af755b1aa24b 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4805,7 +4805,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, > enum port port) > { > struct intel_digital_port *intel_dig_port; > struct intel_encoder *encoder; > - bool init_hdmi, init_dp, init_lspcon = false; > + bool init_hdmi, init_dp; > enum phy phy = intel_port_to_phy(dev_priv, port); > > init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) || > @@ -4819,7 +4819,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, > enum port port) >* is initialized before lspcon. >*/ > init_dp = true; > - init_lspcon = true; > init_hdmi = false; > drm_dbg_kms(_priv->drm, "VBT says port %c has lspcon\n", > port_name(port)); > @@ -4904,22 +4903,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, > enum port port) > goto err; > } > > - if (init_lspcon) { > - if (lspcon_init(intel_dig_port)) > - /* TODO: handle hdmi info frame part */ > - drm_dbg_kms(_priv->drm, > - "LSPCON init success on port %c\n", > - port_name(port)); > - else > - /* > - * LSPCON init faied, but DP init was success, so > - * lets try to drive as DP++ port. > - */ > - drm_err(_priv->drm, > - "LSPCON init failed on port %c\n", > - 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; > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index ed9e53c373a7..398a104158a8 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5962,15 +5962,14 @@ static enum drm_connector_status > intel_dp_detect_dpcd(struct intel_dp *intel_dp) > { > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > u8 *dpcd = intel_dp->dpcd; > u8 type; > > if (WARN_ON(intel_dp_is_edp(intel_dp))) > return connector_status_connected; > > - if (lspcon->active) > - lspcon_resume(lspcon); > + lspcon_resume(dig_port); > > if (!intel_dp_get_dpcd(intel_dp)) > return connector_status_disconnected; > @@ -7056,14 +7055,13 @@ void intel_dp_encoder_reset(struct drm_encoder > *encoder) > { > struct drm_i915_private *dev_priv = to_i915(encoder->dev); > struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); > - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > intel_wakeref_t wakeref; > > if
Re: [Intel-gfx] [PATCH v6] drm/i915: Init lspcon after HPD in intel_dp_detect()
Hi Jani, > On Jul 10, 2020, at 23:48, Kai-Heng Feng wrote: > > > >> On Jun 30, 2020, at 16:37, Kai-Heng Feng wrote: >> >> >>> On Jun 10, 2020, at 15:55, Kai-Heng Feng >>> wrote: >>> >>> On HP 800 G4 DM, if HDMI cable isn't plugged before boot, the HDMI port >>> becomes useless and never responds to cable hotplugging: >>> [3.031904] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon >>> [3.031945] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on >>> port D >>> >>> Seems like the lspcon chip on the system only gets powered after the >>> cable is plugged. >>> >>> Consilidate lspcon_init() into lspcon_resume() to dynamically init >>> lspcon chip, and make HDMI port work. >>> >>> Signed-off-by: Kai-Heng Feng >> >> A gentle ping... > > Another gentle ping... Can you please help reviewing this? Thanks! Kai-Heng > >> >>> --- >>> v6: >>> - Rebase on latest for-linux-next. >>> >>> v5: >>> - Consolidate lspcon_resume() with lspcon_init(). >>> - Move more logic into lspcon code. >>> >>> v4: >>> - Trust VBT in intel_infoframe_init(). >>> - Init lspcon in intel_dp_detect(). >>> >>> v3: >>> - Make sure it's handled under long HPD case. >>> >>> v2: >>> - Move lspcon_init() inside of intel_dp_hpd_pulse(). >>> >>> drivers/gpu/drm/i915/display/intel_ddi.c| 19 +-- >>> drivers/gpu/drm/i915/display/intel_dp.c | 10 ++-- >>> drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- >>> drivers/gpu/drm/i915/display/intel_lspcon.c | 63 - >>> drivers/gpu/drm/i915/display/intel_lspcon.h | 3 +- >>> 5 files changed, 43 insertions(+), 55 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c >>> b/drivers/gpu/drm/i915/display/intel_ddi.c >>> index aa22465bb56e..af755b1aa24b 100644 >>> --- a/drivers/gpu/drm/i915/display/intel_ddi.c >>> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c >>> @@ -4805,7 +4805,7 @@ void intel_ddi_init(struct drm_i915_private >>> *dev_priv, enum port port) >>> { >>> struct intel_digital_port *intel_dig_port; >>> struct intel_encoder *encoder; >>> - bool init_hdmi, init_dp, init_lspcon = false; >>> + bool init_hdmi, init_dp; >>> enum phy phy = intel_port_to_phy(dev_priv, port); >>> >>> init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) || >>> @@ -4819,7 +4819,6 @@ void intel_ddi_init(struct drm_i915_private >>> *dev_priv, enum port port) >>> * is initialized before lspcon. >>> */ >>> init_dp = true; >>> - init_lspcon = true; >>> init_hdmi = false; >>> drm_dbg_kms(_priv->drm, "VBT says port %c has lspcon\n", >>> port_name(port)); >>> @@ -4904,22 +4903,6 @@ void intel_ddi_init(struct drm_i915_private >>> *dev_priv, enum port port) >>> goto err; >>> } >>> >>> - if (init_lspcon) { >>> - if (lspcon_init(intel_dig_port)) >>> - /* TODO: handle hdmi info frame part */ >>> - drm_dbg_kms(_priv->drm, >>> - "LSPCON init success on port %c\n", >>> - port_name(port)); >>> - else >>> - /* >>> -* LSPCON init faied, but DP init was success, so >>> -* lets try to drive as DP++ port. >>> -*/ >>> - drm_err(_priv->drm, >>> - "LSPCON init failed on port %c\n", >>> - 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; >>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c >>> b/drivers/gpu/drm/i915/display/intel_dp.c >>> index ed9e53c373a7..398a104158a8 100644 >>> --- a/drivers/gpu/drm/i915/display/intel_dp.c >>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >>> @@ -5962,15 +5962,14 @@ static enum drm_connector_status >>> intel_dp_detect_dpcd(struct intel_dp *intel_dp) >>> { >>> struct drm_i915_private *i915 = dp_to_i915(intel_dp); >>> - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); >>> + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); >>> u8 *dpcd = intel_dp->dpcd; >>> u8 type; >>> >>> if (WARN_ON(intel_dp_is_edp(intel_dp))) >>> return connector_status_connected; >>> >>> - if (lspcon->active) >>> - lspcon_resume(lspcon); >>> + lspcon_resume(dig_port); >>> >>> if (!intel_dp_get_dpcd(intel_dp)) >>> return connector_status_disconnected; >>> @@ -7056,14 +7055,13 @@ void intel_dp_encoder_reset(struct drm_encoder >>> *encoder) >>> { >>> struct drm_i915_private *dev_priv = to_i915(encoder->dev); >>> struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); >>> - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); >>> + struct intel_digital_port *dig_port =
Re: [Intel-gfx] [PATCH v6] drm/i915: Init lspcon after HPD in intel_dp_detect()
> On Jun 30, 2020, at 16:37, Kai-Heng Feng wrote: > > >> On Jun 10, 2020, at 15:55, Kai-Heng Feng wrote: >> >> On HP 800 G4 DM, if HDMI cable isn't plugged before boot, the HDMI port >> becomes useless and never responds to cable hotplugging: >> [3.031904] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon >> [3.031945] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on >> port D >> >> Seems like the lspcon chip on the system only gets powered after the >> cable is plugged. >> >> Consilidate lspcon_init() into lspcon_resume() to dynamically init >> lspcon chip, and make HDMI port work. >> >> Signed-off-by: Kai-Heng Feng > > A gentle ping... Another gentle ping... > >> --- >> v6: >> - Rebase on latest for-linux-next. >> >> v5: >> - Consolidate lspcon_resume() with lspcon_init(). >> - Move more logic into lspcon code. >> >> v4: >> - Trust VBT in intel_infoframe_init(). >> - Init lspcon in intel_dp_detect(). >> >> v3: >> - Make sure it's handled under long HPD case. >> >> v2: >> - Move lspcon_init() inside of intel_dp_hpd_pulse(). >> >> drivers/gpu/drm/i915/display/intel_ddi.c| 19 +-- >> drivers/gpu/drm/i915/display/intel_dp.c | 10 ++-- >> drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- >> drivers/gpu/drm/i915/display/intel_lspcon.c | 63 - >> drivers/gpu/drm/i915/display/intel_lspcon.h | 3 +- >> 5 files changed, 43 insertions(+), 55 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c >> b/drivers/gpu/drm/i915/display/intel_ddi.c >> index aa22465bb56e..af755b1aa24b 100644 >> --- a/drivers/gpu/drm/i915/display/intel_ddi.c >> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c >> @@ -4805,7 +4805,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, >> enum port port) >> { >> struct intel_digital_port *intel_dig_port; >> struct intel_encoder *encoder; >> -bool init_hdmi, init_dp, init_lspcon = false; >> +bool init_hdmi, init_dp; >> enum phy phy = intel_port_to_phy(dev_priv, port); >> >> init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) || >> @@ -4819,7 +4819,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, >> enum port port) >> * is initialized before lspcon. >> */ >> init_dp = true; >> -init_lspcon = true; >> init_hdmi = false; >> drm_dbg_kms(_priv->drm, "VBT says port %c has lspcon\n", >> port_name(port)); >> @@ -4904,22 +4903,6 @@ void intel_ddi_init(struct drm_i915_private >> *dev_priv, enum port port) >> goto err; >> } >> >> -if (init_lspcon) { >> -if (lspcon_init(intel_dig_port)) >> -/* TODO: handle hdmi info frame part */ >> -drm_dbg_kms(_priv->drm, >> -"LSPCON init success on port %c\n", >> -port_name(port)); >> -else >> -/* >> - * LSPCON init faied, but DP init was success, so >> - * lets try to drive as DP++ port. >> - */ >> -drm_err(_priv->drm, >> -"LSPCON init failed on port %c\n", >> -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; >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c >> b/drivers/gpu/drm/i915/display/intel_dp.c >> index ed9e53c373a7..398a104158a8 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp.c >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >> @@ -5962,15 +5962,14 @@ static enum drm_connector_status >> intel_dp_detect_dpcd(struct intel_dp *intel_dp) >> { >> struct drm_i915_private *i915 = dp_to_i915(intel_dp); >> -struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); >> +struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); >> u8 *dpcd = intel_dp->dpcd; >> u8 type; >> >> if (WARN_ON(intel_dp_is_edp(intel_dp))) >> return connector_status_connected; >> >> -if (lspcon->active) >> -lspcon_resume(lspcon); >> +lspcon_resume(dig_port); >> >> if (!intel_dp_get_dpcd(intel_dp)) >> return connector_status_disconnected; >> @@ -7056,14 +7055,13 @@ void intel_dp_encoder_reset(struct drm_encoder >> *encoder) >> { >> struct drm_i915_private *dev_priv = to_i915(encoder->dev); >> struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); >> -struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); >> +struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); >> intel_wakeref_t wakeref; >> >> if (!HAS_DDI(dev_priv)) >> intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg); >> >> -if (lspcon->active) >> -
Re: [Intel-gfx] [PATCH v6] drm/i915: Init lspcon after HPD in intel_dp_detect()
> On Jun 10, 2020, at 15:55, Kai-Heng Feng wrote: > > On HP 800 G4 DM, if HDMI cable isn't plugged before boot, the HDMI port > becomes useless and never responds to cable hotplugging: > [3.031904] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon > [3.031945] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on port > D > > Seems like the lspcon chip on the system only gets powered after the > cable is plugged. > > Consilidate lspcon_init() into lspcon_resume() to dynamically init > lspcon chip, and make HDMI port work. > > Signed-off-by: Kai-Heng Feng A gentle ping... > --- > v6: > - Rebase on latest for-linux-next. > > v5: > - Consolidate lspcon_resume() with lspcon_init(). > - Move more logic into lspcon code. > > v4: > - Trust VBT in intel_infoframe_init(). > - Init lspcon in intel_dp_detect(). > > v3: > - Make sure it's handled under long HPD case. > > v2: > - Move lspcon_init() inside of intel_dp_hpd_pulse(). > > drivers/gpu/drm/i915/display/intel_ddi.c| 19 +-- > drivers/gpu/drm/i915/display/intel_dp.c | 10 ++-- > drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- > drivers/gpu/drm/i915/display/intel_lspcon.c | 63 - > drivers/gpu/drm/i915/display/intel_lspcon.h | 3 +- > 5 files changed, 43 insertions(+), 55 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index aa22465bb56e..af755b1aa24b 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4805,7 +4805,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, > enum port port) > { > struct intel_digital_port *intel_dig_port; > struct intel_encoder *encoder; > - bool init_hdmi, init_dp, init_lspcon = false; > + bool init_hdmi, init_dp; > enum phy phy = intel_port_to_phy(dev_priv, port); > > init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) || > @@ -4819,7 +4819,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, > enum port port) >* is initialized before lspcon. >*/ > init_dp = true; > - init_lspcon = true; > init_hdmi = false; > drm_dbg_kms(_priv->drm, "VBT says port %c has lspcon\n", > port_name(port)); > @@ -4904,22 +4903,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, > enum port port) > goto err; > } > > - if (init_lspcon) { > - if (lspcon_init(intel_dig_port)) > - /* TODO: handle hdmi info frame part */ > - drm_dbg_kms(_priv->drm, > - "LSPCON init success on port %c\n", > - port_name(port)); > - else > - /* > - * LSPCON init faied, but DP init was success, so > - * lets try to drive as DP++ port. > - */ > - drm_err(_priv->drm, > - "LSPCON init failed on port %c\n", > - 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; > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index ed9e53c373a7..398a104158a8 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5962,15 +5962,14 @@ static enum drm_connector_status > intel_dp_detect_dpcd(struct intel_dp *intel_dp) > { > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > u8 *dpcd = intel_dp->dpcd; > u8 type; > > if (WARN_ON(intel_dp_is_edp(intel_dp))) > return connector_status_connected; > > - if (lspcon->active) > - lspcon_resume(lspcon); > + lspcon_resume(dig_port); > > if (!intel_dp_get_dpcd(intel_dp)) > return connector_status_disconnected; > @@ -7056,14 +7055,13 @@ void intel_dp_encoder_reset(struct drm_encoder > *encoder) > { > struct drm_i915_private *dev_priv = to_i915(encoder->dev); > struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); > - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > intel_wakeref_t wakeref; > > if (!HAS_DDI(dev_priv)) > intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg); > > - if (lspcon->active) > - lspcon_resume(lspcon); > + lspcon_resume(dig_port); > > intel_dp->reset_link_params = true; > > diff --git
[Intel-gfx] [PATCH v6] drm/i915: Init lspcon after HPD in intel_dp_detect()
On HP 800 G4 DM, if HDMI cable isn't plugged before boot, the HDMI port becomes useless and never responds to cable hotplugging: [3.031904] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon [3.031945] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on port D Seems like the lspcon chip on the system only gets powered after the cable is plugged. Consilidate lspcon_init() into lspcon_resume() to dynamically init lspcon chip, and make HDMI port work. Signed-off-by: Kai-Heng Feng --- v6: - Rebase on latest for-linux-next. v5: - Consolidate lspcon_resume() with lspcon_init(). - Move more logic into lspcon code. v4: - Trust VBT in intel_infoframe_init(). - Init lspcon in intel_dp_detect(). v3: - Make sure it's handled under long HPD case. v2: - Move lspcon_init() inside of intel_dp_hpd_pulse(). drivers/gpu/drm/i915/display/intel_ddi.c| 19 +-- drivers/gpu/drm/i915/display/intel_dp.c | 10 ++-- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 63 - drivers/gpu/drm/i915/display/intel_lspcon.h | 3 +- 5 files changed, 43 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index aa22465bb56e..af755b1aa24b 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4805,7 +4805,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) { struct intel_digital_port *intel_dig_port; struct intel_encoder *encoder; - bool init_hdmi, init_dp, init_lspcon = false; + bool init_hdmi, init_dp; enum phy phy = intel_port_to_phy(dev_priv, port); init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) || @@ -4819,7 +4819,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) * is initialized before lspcon. */ init_dp = true; - init_lspcon = true; init_hdmi = false; drm_dbg_kms(_priv->drm, "VBT says port %c has lspcon\n", port_name(port)); @@ -4904,22 +4903,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) goto err; } - if (init_lspcon) { - if (lspcon_init(intel_dig_port)) - /* TODO: handle hdmi info frame part */ - drm_dbg_kms(_priv->drm, - "LSPCON init success on port %c\n", - port_name(port)); - else - /* -* LSPCON init faied, but DP init was success, so -* lets try to drive as DP++ port. -*/ - drm_err(_priv->drm, - "LSPCON init failed on port %c\n", - 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; diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index ed9e53c373a7..398a104158a8 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5962,15 +5962,14 @@ static enum drm_connector_status intel_dp_detect_dpcd(struct intel_dp *intel_dp) { struct drm_i915_private *i915 = dp_to_i915(intel_dp); - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); u8 *dpcd = intel_dp->dpcd; u8 type; if (WARN_ON(intel_dp_is_edp(intel_dp))) return connector_status_connected; - if (lspcon->active) - lspcon_resume(lspcon); + lspcon_resume(dig_port); if (!intel_dp_get_dpcd(intel_dp)) return connector_status_disconnected; @@ -7056,14 +7055,13 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->dev); struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); - struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); intel_wakeref_t wakeref; if (!HAS_DDI(dev_priv)) intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg); - if (lspcon->active) - lspcon_resume(lspcon); + lspcon_resume(dig_port); intel_dp->reset_link_params = true; diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 010f37240710..643ad2127931 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@