aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-05-05 10:17:27 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-05-21 16:52:56 -0400
commitccbaefa09d73f8724b3040b80a2521454af61ae4 (patch)
tree5b29d7ca79fca15736f9513539e484c873a46d27 /drivers/gpu/drm/i915/intel_hdmi.c
parent5d96d8afcfbb1500272756747e0bfcdbebf3b070 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-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 d04e6dc97fe5..91e152c15271 100644
--- 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)
904 } 904 }
905 } 905 }
906 906
907 /* HW workaround, need to toggle enable bit off and on for 12bpc, but
908 * we do this anyway which shows more stable in testing.
909 */
910 if (HAS_PCH_SPLIT(dev)) {
911 I915_WRITE(intel_hdmi->hdmi_reg, temp & ~SDVO_ENABLE);
912 POSTING_READ(intel_hdmi->hdmi_reg);
913 }
914
915 temp &= ~enable_bits; 907 temp &= ~enable_bits;
916 908
917 I915_WRITE(intel_hdmi->hdmi_reg, temp); 909 I915_WRITE(intel_hdmi->hdmi_reg, temp);