]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/i915: clear crt hotplug compare voltage field before setting
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 27 Mar 2013 14:47:11 +0000 (15:47 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 27 Mar 2013 16:13:45 +0000 (17:13 +0100)
Noticed while reviewing the hotplug irq setup code. Just looks better.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index 666a0ecebb1228a640cc9147d19d89f986a82300..15a97ea2d6ea1a79ea16af3784fe0d44aef060c4 100644 (file)
@@ -2775,6 +2775,7 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
                */
                if (IS_G4X(dev))
                        hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
+               hotplug_en &= ~CRT_HOTPLUG_VOLTAGE_COMPARE_MASK;
                hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
 
                /* Ignore TV since it's buggy */