Rename several variables in the damage-helper code to better reflect the use of old and new state. No functional changes.
Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/drm_damage_helper.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index d8b2955e88fd..4b1f26ef119f 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -53,7 +53,7 @@ static void convert_clip_rect_to_rect(const struct drm_clip_rect *src, /** * drm_atomic_helper_check_plane_damage - Verify plane damage on atomic_check. * @state: The driver state object. - * @plane_state: Plane state for which to verify damage. + * @new_plane_state: Plane state for which to verify damage. * * This helper function makes sure that damage from plane state is discarded * for full modeset. If there are more reasons a driver would want to do a full @@ -65,20 +65,19 @@ static void convert_clip_rect_to_rect(const struct drm_clip_rect *src, * &drm_plane_state.src as damage. */ void drm_atomic_helper_check_plane_damage(struct drm_atomic_state *state, - struct drm_plane_state *plane_state) + struct drm_plane_state *new_plane_state) { - struct drm_crtc_state *crtc_state; + struct drm_crtc_state *new_crtc_state; - if (plane_state->crtc) { - crtc_state = drm_atomic_get_new_crtc_state(state, - plane_state->crtc); + if (new_plane_state->crtc) { + new_crtc_state = drm_atomic_get_new_crtc_state(state, new_plane_state->crtc); - if (WARN_ON(!crtc_state)) + if (WARN_ON(!new_crtc_state)) return; - if (drm_atomic_crtc_needs_modeset(crtc_state)) { - drm_property_blob_put(plane_state->fb_damage_clips); - plane_state->fb_damage_clips = NULL; + if (drm_atomic_crtc_needs_modeset(new_crtc_state)) { + drm_property_blob_put(new_plane_state->fb_damage_clips); + new_plane_state->fb_damage_clips = NULL; } } } -- 2.37.3
