From: Laurent Pinchart Date: Sun, 22 Feb 2015 11:24:18 +0000 (+0100) Subject: drm/atomic: Rename drm_atomic_helper_commit_pre_planes() state argument X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a072f809b69885c77262fb978b008ef9488d513e;p=linux-beck.git drm/atomic: Rename drm_atomic_helper_commit_pre_planes() state argument 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 Reviewed-by: Rob Clark Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9e8767118edb..65b9adf5777c 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);