From: Daniel Vetter Date: Wed, 27 Mar 2013 14:47:11 +0000 (+0100) Subject: drm/i915: clear crt hotplug compare voltage field before setting X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=85fc95ba85fe4f51691e0c032954d49e73becd47;p=openwrt%2Fstaging%2Fblogic.git drm/i915: clear crt hotplug compare voltage field before setting Noticed while reviewing the hotplug irq setup code. Just looks better. Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 666a0ecebb12..15a97ea2d6ea 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -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 */