[Intel-gfx] [PATCH 1/3] drm/i915: Fix hotplug interrupt enabling for SDVOC

[Daniel Vetter]

Same regression note:

commit 1d843f9de4e6dc6a899b6f07f106c00da09925e6
Author: Egbert Eich <eich at suse.de>
Date:   Mon Feb 25 12:06:49 2013 -0500

    DRM/I915: Add enum hpd_pin to intel_encoder.

I can add both when merging the patches.
-Daniel


On Sun, Jun 9, 2013 at 5:02 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> A broken conditional would lead to SDVOC waiting upon hotplug events on
> SDVOB - and so miss all activity on its SDVO port.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=58405
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_sdvo.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index dd97941..eb56e1f 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2896,8 +2896,10 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
>         /* Only enable the hotplug irq if we need it, to work around noisy
>          * hotplug lines.
>          */
> -       if (intel_sdvo->hotplug_active)
> -               intel_encoder->hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C;
> +       if (intel_sdvo->hotplug_active) {
> +               intel_encoder->hpd_pin =
> +                       intel_sdvo->is_sdvob ?  HPD_SDVO_B : HPD_SDVO_C;
> +       }
>
>         intel_encoder->compute_config = intel_sdvo_compute_config;
>         intel_encoder->disable = intel_disable_sdvo;
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch