On Fri, 11 May 2012 09:21:25 +0100 Chris Wilson <chris at chris-wilson.co.uk> wrote: > Cc: Jesse Barnes <jbarnes at virtuousgeek.org> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_display.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 8d55dc9..12dba60 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2878,6 +2878,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); > Seems like a reasonable check. Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org> -- Jesse Barnes, Intel Open Source Technology Center