From d00bf54a9da41220a2fc1d4a0ca8c562a54aec1b Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 11 May 2012 09:21:25 +0100 Subject: [PATCH] --- yaml --- r: 307452 b: refs/heads/master c: e7e164db6db292d6f804ec6cd25f29ff62dd0618 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 15373da4b9f2..b6e1a5dcfd5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c14f52860e9e8a6e6db65b7d10dfea7c8f82aa1e +refs/heads/master: e7e164db6db292d6f804ec6cd25f29ff62dd0618 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 1a06f97e73f8..391439fa17b2 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -2782,6 +2782,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc) int pipe = intel_crtc->pipe; u32 reg, temp; + assert_transcoder_disabled(dev_priv, pipe); + /* For PCH output, training FDI link */ dev_priv->display.fdi_link_train(crtc);