On Wed, May 30, 2012 at 11:27:46AM +0100, Chris Wilson wrote: > On Wed, 30 May 2012 12:31:58 +0200, Daniel Vetter <daniel.vetter at ffwll.ch> wrote: > > Let's be a bit more paranoid here. > > > > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> > > --- > > drivers/gpu/drm/i915/intel_display.c | 6 ++++++ > > 1 files changed, 6 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 3c71850..a9bc673 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -1224,6 +1224,9 @@ static void assert_pch_dp_disabled(struct drm_i915_private *dev_priv, > > WARN(dp_pipe_enabled(dev_priv, pipe, port_sel, val), > > "PCH DP (0x%08x) enabled on transcoder %c, should be disabled\n", > > reg, pipe_name(pipe)); > > + > > + WARN(HAS_PCH_IBX(dev_priv->dev) && (val & SDVO_PIPE_B_SELECT), > > + "IBX PCH dp port still using transcoder B\n"); > > Only an issue if both pipe B selected and enabled, right? The problem is actually when it's disabled, but still selects transcoder B. The complicating issue is that we can only change the transcoder while the port is enabled. -Daniel -- Daniel Vetter Mail: daniel at ffwll.ch Mobile: +41 (0)79 365 57 48
