Skip to content

Commit

Permalink
drm/i915: don't disable fdi links harder in ilk_crtc_enable
Browse files Browse the repository at this point in the history
Because they should have been disabled when shutting down the display
pipe previously. To ensure that this is the case, add a few assserts
instead of unconditionally disabling the fdi link.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Sep 20, 2012
1 parent a14d335 commit 46b6f81
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3184,10 +3184,12 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)

is_pch_port = intel_crtc_driving_pch(crtc);

if (is_pch_port)
if (is_pch_port) {
ironlake_fdi_pll_enable(intel_crtc);
else
ironlake_fdi_disable(crtc);
} else {
assert_fdi_tx_disabled(dev_priv, pipe);
assert_fdi_rx_disabled(dev_priv, pipe);
}

for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->pre_enable)
Expand Down

0 comments on commit 46b6f81

Please sign in to comment.