On Mon, Apr 18, 2016 at 10:00:36AM -0400, Lyude wrote:
> While VGA hotplugging worked(ish) before, it looks like that was mainly
> because we'd unintentionally enable it in
> valleyview_crt_detect_hotplug() when we did a force trigger. This
> doesn't work reliably enough because whenever the display powerwell on
> vlv gets disabled, the values set in VLV_ADPA get cleared and
> consequently VGA hotplugging gets disabled. This causes bugs such as one
> we found on an Intel NUC, where doing the following sequence of
> hotplugs:
>
> - Disconnect all monitors
> - Connect VGA
> - Disconnect VGA
> - Connect HDMI
>
> Would result in VGA hotplugging becoming disabled, due to the powerwells
> getting toggled in the process of connecting HDMI.
>
> Changes since v2:
> - Use intel_encoder structs instead of drm_encoder structs
>
> Changes since v1:
> - Instead of handling the register writes ourself, we just reuse
> intel_crt_detect()
> - Instead of resetting the ADPA during display IRQ installation, we now
> reset them in vlv_display_power_well_init()
>
> CC: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Lyude <cpaul@xxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_runtime_pm.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 80e8bd4..0eae08a 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -902,6 +902,7 @@ static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv,
>
> static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)
> {
> + struct intel_encoder *encoder;
> enum pipe pipe;
>
> /*
> @@ -935,6 +936,12 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)
>
> intel_hpd_init(dev_priv);
>
> + /* Re-enable the ADPA, if we have one */
> + for_each_intel_encoder(dev_priv->dev, encoder) {
> + if (encoder->type == INTEL_OUTPUT_ANALOG)
> + encoder->base.funcs->reset(&encoder->base);
intel_crt_reset(&encoder->base) would be much easier to navigate.
Or if we want to be a bit more verbose we could call it
intel_crt_hpd_init() or somesuch.
With that
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Before we push these, I think we'll need to do a bit more work to
make sure we don't end up in an infinite crt hpd loop (already
happend to me a few times). I'll polish up my hacks for that and
send them out...
> + }
> +
> i915_redisable_vga_power_on(dev_priv->dev);
> }
>
> --
> 2.5.5
--
Ville Syrjälä
Intel OTC
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html