On Thu, 6 Sep 2012 22:09:35 +0200, Daniel Vetter <daniel.vetter at ffwll.ch> wrote: > We need to check whether the _other plane is on our pipe, not whether > our plane is on the other pipe. Otherwise if not both pipes/planes are > active, we won't properly clean up the mess and set up our desired > plane->pipe mapping. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51265 > Tested-by: Vladyslav Shtabovenko <DFEW.Entwickler at googlemail.com> > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> > --- > drivers/gpu/drm/i915/intel_display.c | 28 ++++++++++++++++++---------- > 1 file changed, 18 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index fd9c275..ce9b247 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -7994,11 +7994,27 @@ static void intel_enable_pipe_a(struct drm_device *dev) > > } > > +static bool > +intel_check_plane_mapping(struct intel_crtc *crtc) > +{ > + struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; > + u32 reg, val; > + > + reg = DSPCNTR(!crtc->plane); > + val = I915_READ(reg); > + > + if ((val & DISPLAY_PLANE_ENABLE) == 0 && > + (!!(val & DISPPLANE_SEL_PIPE_MASK) == crtc->pipe)) > + return false; If the other plane is off but has our pipe selected, turn off our plane. Try again. -Chris -- Chris Wilson, Intel Open Source Technology Centre
