From: Daniel Vetter Date: Wed, 30 Sep 2015 06:47:41 +0000 (+0200) Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next X-Git-Tag: v4.4-rc1~44^2~29^2 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Backmerge to catch up with 4.3. slightly more involved conflict in the irq code, but nothing beyond adjacent changes. Signed-off-by: Daniel Vetter --- 44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2 diff --cc drivers/gpu/drm/i915/i915_irq.c index 6ca6c16fe500,88d064e80783..ff85eae932bc --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@@ -1690,13 -1582,10 +1715,12 @@@ static void i9xx_hpd_irq_handler(struc } else { u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915; - intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, - hotplug_trigger, hpd_status_i915, - i9xx_port_hotplug_long_detect); - intel_hpd_irq_handler(dev, pin_mask, long_mask); + if (hotplug_trigger) { + 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); + } } }