From: Ville Syrjälä Date: Tue, 5 May 2015 14:17:28 +0000 (+0300) Subject: drm/i915: Remove the double register write from intel_disable_hdmi() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c52bcef72afafd89cc3bb71313581ad56eecf725;p=deliverable%2Flinux.git 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ä Reviewed-by: Jesse Barnes [danvet: Resolve conflict with the remove CHV if block.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 91e152c15271..d148e09db901 100644 --- 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)