On Sun, Feb 22, 2015 at 6:24 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > From: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> > > The argument contains a pointer to the old state, rename it to old_state > like in all other commit helper functions. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> Reviewed-by: Rob Clark <robdclark@xxxxxxxxx> > --- > drivers/gpu/drm/drm_atomic_helper.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 5ac38c89be94..63daead31491 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -770,18 +770,18 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > /** > * drm_atomic_helper_commit_pre_planes - modeset commit before plane updates > * @dev: DRM device > - * @state: atomic state > + * @old_state: atomic state object with old state structures > * > * This function commits the modeset changes that need to be committed before > * updating planes. It shuts down all the outputs that need to be shut down and > * prepares them (if required) with the new mode. > */ > void drm_atomic_helper_commit_pre_planes(struct drm_device *dev, > - struct drm_atomic_state *state) > + struct drm_atomic_state *old_state) > { > - disable_outputs(dev, state); > - set_routing_links(dev, state); > - crtc_set_mode(dev, state); > + disable_outputs(dev, old_state); > + set_routing_links(dev, old_state); > + crtc_set_mode(dev, old_state); > } > EXPORT_SYMBOL(drm_atomic_helper_commit_pre_planes); > > -- > 2.1.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel