aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2012-10-05 11:05:59 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-10 10:56:30 -0400
commit1e6210f45d95f1db7831072b7be64f9562280df1 (patch)
treee35bb18d9302b67026812fa4f89e26465d4d02ec
parent6441ab5f8ffdf7e99eefe0fb747858e0c12b567e (diff)
drm/i915: don't rely on previous values set on DDI_BUF_CTL
Just set the only bit we need, everything else is either ignored on HDMI or should be set to zero. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index ab48083ffcec..9a95beafc507 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1017,16 +1017,12 @@ void intel_enable_ddi(struct intel_encoder *encoder)
1017 struct drm_i915_private *dev_priv = dev->dev_private; 1017 struct drm_i915_private *dev_priv = dev->dev_private;
1018 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 1018 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
1019 int port = intel_hdmi->ddi_port; 1019 int port = intel_hdmi->ddi_port;
1020 u32 temp;
1021
1022 temp = I915_READ(DDI_BUF_CTL(port));
1023 temp |= DDI_BUF_CTL_ENABLE;
1024 1020
1025 /* Enable DDI_BUF_CTL. In HDMI/DVI mode, the port width, 1021 /* Enable DDI_BUF_CTL. In HDMI/DVI mode, the port width,
1026 * and swing/emphasis values are ignored so nothing special needs 1022 * and swing/emphasis values are ignored so nothing special needs
1027 * to be done besides enabling the port. 1023 * to be done besides enabling the port.
1028 */ 1024 */
1029 I915_WRITE(DDI_BUF_CTL(port), temp); 1025 I915_WRITE(DDI_BUF_CTL(port), DDI_BUF_CTL_ENABLE);
1030} 1026}
1031 1027
1032void intel_disable_ddi(struct intel_encoder *encoder) 1028void intel_disable_ddi(struct intel_encoder *encoder)