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

drm/i915: use CPU and PCH transcoders on lpt_disable_pch_transcoder 

... instead of "pipe", which is wrong.

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:51 -02:00 committed by Daniel Vetter
parent 32ae46bf01
commit 8a52fd9f24
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1766,22 +1766,20 @@ static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
}
static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv,
enum pipe pipe)
enum transcoder cpu_transcoder)
{
int reg;
u32 val;
/* FDI relies on the transcoder */
assert_fdi_tx_disabled(dev_priv, pipe);
assert_fdi_rx_disabled(dev_priv, pipe);
assert_fdi_tx_disabled(dev_priv, cpu_transcoder);
assert_fdi_rx_disabled(dev_priv, TRANSCODER_A);
reg = TRANSCONF(pipe);
val = I915_READ(reg);
val = I915_READ(_TRANSACONF);
val &= ~TRANS_ENABLE;
I915_WRITE(reg, val);
I915_WRITE(_TRANSACONF, val);
/* wait for PCH transcoder off, transcoder state */
if (wait_for((I915_READ(reg) & TRANS_STATE_ENABLE) == 0, 50))
DRM_ERROR("failed to disable transcoder %d\n", pipe);
if (wait_for((I915_READ(_TRANSACONF) & TRANS_STATE_ENABLE) == 0, 50))
DRM_ERROR("Failed to disable PCH transcoder\n");
}
/**
@ -3630,7 +3628,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
if (is_pch_port) {
ironlake_fdi_disable(crtc);
lpt_disable_pch_transcoder(dev_priv, pipe);
lpt_disable_pch_transcoder(dev_priv, cpu_transcoder);
intel_disable_pch_pll(intel_crtc);
ironlake_fdi_pll_disable(intel_crtc);
}