aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <[email protected]>2015-05-05 17:17:28 +0300
committerDaniel Vetter <[email protected]>2015-05-21 22:55:58 +0200
commitc52bcef72afafd89cc3bb71313581ad56eecf725 (patch)
treee6ab89f0b60b904cb0e14f996d1742f3bcb2fd2f
parentccbaefa09d73f8724b3040b80a2521454af61ae4 (diff)
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ä <[email protected]> Reviewed-by: Jesse Barnes <[email protected]> [danvet: Resolve conflict with the remove CHV if block.] Signed-off-by: Daniel Vetter <[email protected]>
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c8
1 files changed, 0 insertions, 8 deletions
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)