drm/i915: Remove the double register write from intel_disable_hdmi()

IBX can have problems with the first write to the port register getting
masked when enabling the port. We are trying to apply the workaround
also when disabling the port where it's not needed, and we also try
to apply it for CPT/PPT as well which don't need it. Just kill it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Resolve conflict with the remove CHV if block.]
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 91e152c152717ee5fcd404d6551b57c79c8a6a7f..d148e09db901333a8b3472d0f6610ee647889b77 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -908,14 +908,6 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
 
        I915_WRITE(intel_hdmi->hdmi_reg, temp);
        POSTING_READ(intel_hdmi->hdmi_reg);
-
-       /* HW workaround, need to write this twice for issue that may result
-        * in first write getting masked.
-        */
-       if (HAS_PCH_SPLIT(dev)) {
-               I915_WRITE(intel_hdmi->hdmi_reg, temp);
-               POSTING_READ(intel_hdmi->hdmi_reg);
-       }
 }
 
 static int hdmi_portclock_limit(struct intel_hdmi *hdmi, bool respect_dvi_limit)