summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-27 15:47:11 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-27 17:13:45 +0100
commit85fc95ba85fe4f51691e0c032954d49e73becd47 (patch)
tree7267b83e3d8b99e5964792bb290f60b7ae859a56 /drivers/gpu/drm
parented23abdd648358e69c1a94e0c70e45f6a23a7aab (diff)
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ä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 666a0ecebb1..15a97ea2d6e 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 */