[Intel-gfx] [PATCH] drm/i915: Drop a spurious intel_pre_plane_update() call

[Daniel Vetter]

On Fri, Jul 03, 2015 at 11:50:10AM -0300, Paulo Zanoni wrote:
> 2015-07-03 5:22 GMT-03:00  <ville.syrjala at linux.intel.com>:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> > Kill the extra intel_pre_plane_update() I accidentally added in
> >
> >  commit 852eb00dc44ea2b8896e2fa27c6a36a1f697ba5a
> >  Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >  Date:   Wed Jun 24 22:00:07 2015 +0300
> >
> >     drm/i915: Try to make sure cxsr is disabled around plane
> >     enable/disable
> >
> > This fixes a load of warnings from the frontbuffer tracking.
> >
> > Testcase: igt/kms_frontbuffer_tracking/fbc-1p-rte
> > Tested-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> > Tested-by: Matt Roper <matthew.d.roper at intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 724b0e3..5de1ded 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -13141,8 +13141,6 @@ static int __intel_set_mode(struct drm_atomic_state *state)
> >                 if (!needs_modeset(crtc->state))
> >                         continue;
> >
> > -               intel_pre_plane_update(intel_crtc);
> > -
> >                 any_ms = true;
> >                 intel_pre_plane_update(intel_crtc);
> 
> Despite the lack of documentation, I don't think this function was
> designed to be called twice like that, so:
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch