Skip to content

Commit

Permalink
drm/i915: don't assert disabled FDI before disabling the FDI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Nov 11, 2012
1 parent fd9c018 commit ab4d966
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit ab4d966

Please sign in to comment.