drm/i915: Remove a bogus 12bpc "toggle" from intel_disable_hdmi()

The IBX 12bpc port enable toggle is only relevant when enabling
the port, not when disabling it. Also this code doesn't actually
toggle anything, and essentially just writes the port register
one extra time. Furthermore CPT/PPT don't need such workarounds
and yet we include them. Just kill it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index d04e6dc97fe5ca5538bfaee254f42a78a1819938..91e152c152717ee5fcd404d6551b57c79c8a6a7f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -904,14 +904,6 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
                }
        }
 
-       /* HW workaround, need to toggle enable bit off and on for 12bpc, but
-        * we do this anyway which shows more stable in testing.
-        */
-       if (HAS_PCH_SPLIT(dev)) {
-               I915_WRITE(intel_hdmi->hdmi_reg, temp & ~SDVO_ENABLE);
-               POSTING_READ(intel_hdmi->hdmi_reg);
-       }
-
        temp &= ~enable_bits;
 
        I915_WRITE(intel_hdmi->hdmi_reg, temp);