drm/i915: completely reset the value of DDI_FUNC_CTL
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Wed, 8 Aug 2012 17:15:30 +0000 (14:15 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 9 Aug 2012 16:41:25 +0000 (18:41 +0200)
Don't rely on previous values already set on the register. Everything
we're not explicitly setting should be zero for now.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_ddi.c

index 8b383593b0d30d3f2a1ab7a504fea5a753bfc187..ff03a3a5719377e9854dbbb589e132c05d0a1c81 100644 (file)
@@ -723,12 +723,7 @@ void intel_ddi_mode_set(struct drm_encoder *encoder,
        }
 
        /* Enable PIPE_DDI_FUNC_CTL for the pipe to work in HDMI mode */
-       temp = I915_READ(DDI_FUNC_CTL(pipe));
-       temp &= ~PIPE_DDI_PORT_MASK;
-       temp &= ~PIPE_DDI_BPC_MASK;
-       temp &= ~PIPE_DDI_MODE_SELECT_MASK;
-       temp &= ~(PIPE_DDI_PVSYNC | PIPE_DDI_PHSYNC);
-       temp |= PIPE_DDI_FUNC_ENABLE | PIPE_DDI_SELECT_PORT(port);
+       temp = PIPE_DDI_FUNC_ENABLE | PIPE_DDI_SELECT_PORT(port);
 
        switch (intel_crtc->bpp) {
        case 18: