openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: don't assert disabled FDI before disabling the FDI 

On Haswell/LPT we must disable the PCH transcoder before we disable
the FDI, so don't check for disabled FDI there.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni 2012-10-31 18:12:55 -02:00 committed by Daniel Vetter
parent fd9c018898
commit ab4d966c52
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/intel_display.c
View File

@ -1770,15 +1770,10 @@ static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
DRM_ERROR("failed to disable transcoder %d\n", pipe);
}
static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv,
enum transcoder cpu_transcoder)
static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv)
{
u32 val;
/* FDI relies on the transcoder */
assert_fdi_tx_disabled(dev_priv, cpu_transcoder);
assert_fdi_rx_disabled(dev_priv, TRANSCODER_A);
val = I915_READ(_TRANSACONF);
val &= ~TRANS_ENABLE;
I915_WRITE(_TRANSACONF, val);
@ -3638,7 +3633,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
if (is_pch_port) {
ironlake_fdi_disable(crtc);
lpt_disable_pch_transcoder(dev_priv, cpu_transcoder);
lpt_disable_pch_transcoder(dev_priv);
ironlake_fdi_pll_disable(intel_crtc);
}