Rename some of the state parameters of the damage-helper functions to align them with each other and other helpers. No functional changes.
Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/drm_damage_helper.c | 20 ++++++++++---------- include/drm/drm_damage_helper.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index 28b847636253..23701e5c51b7 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -209,7 +209,7 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb); /** * drm_atomic_helper_damage_iter_init - Initialize the damage iterator. * @iter: The iterator to initialize. - * @state: Plane state from which to iterate the damage clips. + * @plane_state: Plane state from which to iterate the damage clips. * * Initialize an iterator, which clips plane damage * &drm_plane_state.fb_damage_clips to plane &drm_plane_state.src. This iterator @@ -225,26 +225,26 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb); */ void drm_atomic_helper_damage_iter_init(struct drm_atomic_helper_damage_iter *iter, - const struct drm_plane_state *state) + const struct drm_plane_state *plane_state) { struct drm_rect src; memset(iter, 0, sizeof(*iter)); - if (!state || !state->crtc || !state->fb || !state->visible) + if (!plane_state || !plane_state->crtc || !plane_state->fb || !plane_state->visible) return; - iter->clips = (struct drm_rect *)drm_plane_get_damage_clips(state); - iter->num_clips = drm_plane_get_damage_clips_count(state); + iter->clips = (struct drm_rect *)drm_plane_get_damage_clips(plane_state); + iter->num_clips = drm_plane_get_damage_clips_count(plane_state); /* Round down for x1/y1 and round up for x2/y2 to catch all pixels */ - src = drm_plane_state_src(state); + src = drm_plane_state_src(plane_state); iter->plane_src.x1 = src.x1 >> 16; iter->plane_src.y1 = src.y1 >> 16; iter->plane_src.x2 = (src.x2 >> 16) + !!(src.x2 & 0xFFFF); iter->plane_src.y2 = (src.y2 >> 16) + !!(src.y2 & 0xFFFF); - if (!iter->clips || state->ignore_damage_clips) { + if (!iter->clips || plane_state->ignore_damage_clips) { iter->clips = NULL; iter->num_clips = 0; iter->full_update = true; @@ -296,7 +296,7 @@ EXPORT_SYMBOL(drm_atomic_helper_damage_iter_next); /** * drm_atomic_helper_damage_merged - Merged plane damage - * @state: Plane state from which to iterate the damage clips. + * @plane_state: Plane state from which to iterate the damage clips. * @rect: Returns the merged damage rectangle * * This function merges any valid plane damage clips into one rectangle and @@ -308,7 +308,7 @@ EXPORT_SYMBOL(drm_atomic_helper_damage_iter_next); * Returns: * True if there is valid plane damage otherwise false. */ -bool drm_atomic_helper_damage_merged(const struct drm_plane_state *state, +bool drm_atomic_helper_damage_merged(const struct drm_plane_state *plane_state, struct drm_rect *rect) { struct drm_atomic_helper_damage_iter iter; @@ -320,7 +320,7 @@ bool drm_atomic_helper_damage_merged(const struct drm_plane_state *state, rect->x2 = 0; rect->y2 = 0; - drm_atomic_helper_damage_iter_init(&iter, state); + drm_atomic_helper_damage_iter_init(&iter, plane_state); drm_atomic_for_each_plane_damage(&iter, &clip) { rect->x1 = min(rect->x1, clip.x1); rect->y1 = min(rect->y1, clip.y1); diff --git a/include/drm/drm_damage_helper.h b/include/drm/drm_damage_helper.h index b5a4de779db6..4a1ac47b9051 100644 --- a/include/drm/drm_damage_helper.h +++ b/include/drm/drm_damage_helper.h @@ -73,11 +73,11 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb, unsigned int num_clips); void drm_atomic_helper_damage_iter_init(struct drm_atomic_helper_damage_iter *iter, - const struct drm_plane_state *state); + const struct drm_plane_state *plane_state); bool drm_atomic_helper_damage_iter_next(struct drm_atomic_helper_damage_iter *iter, struct drm_rect *rect); -bool drm_atomic_helper_damage_merged(const struct drm_plane_state *state, +bool drm_atomic_helper_damage_merged(const struct drm_plane_state *plane_state, struct drm_rect *rect); #endif -- 2.54.0
