[Intel-gfx] [PATCH 17/17] drm/i915: Pass hpd_status_i915[] to intel_get_hpd_pins() in pre-g4x

[Paulo Zanoni]

2015-08-27 17:56 GMT-03:00  <ville.syrjala at linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Pass the correct hpd[] array to intel_get_hpd_pins() on pre-g4x
> platforms.
>
> This got broken in the following commit:
> commit fd63e2a972c670887e5e8a08440111d3812c0996
> Author: Imre Deak <imre.deak at intel.com>
> Date:   Tue Jul 21 15:32:44 2015 -0700
>
>     drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins

The good & old "copy, paste, then adjust only one of the two variable
names" error.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

>
> Cc: Imre Deak <imre.deak at intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 1a29dfd..9866739 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1644,7 +1644,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev)
>                 u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
>
>                 intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
> -                                  hotplug_trigger, hpd_status_g4x,
> +                                  hotplug_trigger, hpd_status_i915,
>                                    i9xx_port_hotplug_long_detect);
>                 intel_hpd_irq_handler(dev, pin_mask, long_mask);
>         }
> --
> 2.4.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni