diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-08-27 23:56:12 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-09-02 16:33:54 +0300 |
| commit | 4e3d1e26c2b2c40ebff69f2825fa862bfcf082d1 (patch) | |
| tree | 3cdd0a2843fffa1786a21ada347b334fe875d3ef /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 16f7249ddf831f5ec0e1358222ce5db300446b84 (diff) | |
| download | op-kernel-dev-4e3d1e26c2b2c40ebff69f2825fa862bfcf082d1.zip op-kernel-dev-4e3d1e26c2b2c40ebff69f2825fa862bfcf082d1.tar.gz | |
drm/i915: Pass hpd_status_i915[] to intel_get_hpd_pins() in pre-g4x
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@intel.com>
Date: Tue Jul 21 15:32:44 2015 -0700
drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Egbert Eich <eich@suse.de>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index d94c92d..a2bceb7 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1558,7 +1558,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); } |
