[PATCH 2/4] drm/damage-helper: Add drm_atomic_helper_damage_merged()

[Noralf Trønnes]

Den 09.01.2019 18.49, skrev Noralf Trønnes:
> Useful for drivers that only care about the combined damage.
> 
> Cc: Deepak Rawat <drawat at vmware.com>
> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>
> ---
>  drivers/gpu/drm/drm_damage_helper.c | 43 +++++++++++++++++++++++++++++
>  include/drm/drm_damage_helper.h     |  3 ++
>  2 files changed, 46 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c
> index d2a1c7372f36..4ddf1b41a852 100644
> --- a/drivers/gpu/drm/drm_damage_helper.c
> +++ b/drivers/gpu/drm/drm_damage_helper.c
> @@ -332,3 +332,46 @@ drm_atomic_helper_damage_iter_next(struct drm_atomic_helper_damage_iter *iter,
>  	return ret;
>  }
>  EXPORT_SYMBOL(drm_atomic_helper_damage_iter_next);
> +
> +/**
> + * drm_atomic_helper_damage_merged - Merged plane damage
> + * @old_state: Old plane state for validation.
> + * @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
> + * returns it in @rect. It also clears the plane damage.
> + *
> + * For details see: drm_atomic_helper_damage_iter_init() and
> + * 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 *old_state,
> +				     struct drm_plane_state *state,
> +				     struct drm_rect *rect)
> +{
> +	struct drm_atomic_helper_damage_iter iter;
> +	struct drm_rect clip;
> +	bool valid = false;
> +
> +	rect->x1 = INT_MAX;
> +	rect->y1 = INT_MAX;
> +	rect->x2 = 0;
> +	rect->y2 = 0;
> +
> +	drm_atomic_helper_damage_iter_init(&iter, old_state, state);
> +	drm_atomic_for_each_plane_damage(&iter, &clip) {
> +		rect->x1 = min(rect->x1, clip.x1);
> +		rect->y1 = min(rect->y1, clip.y1);
> +		rect->x2 = max(rect->x2, clip.x2);
> +		rect->y2 = max(rect->y2, clip.y2);
> +		valid = true;
> +	}
> +
> +	drm_property_replace_blob(&state->fb_damage_clips, NULL);

This clearing isn't necessary, it happens in plane state
duplicate/destroy. I had missed fix up commit c75ff001f4fe ("drm: Put
damage blob when destroy plane state").
I will amend this in the next version.

Noralf.

> +
> +	return valid;
> +}
> +EXPORT_SYMBOL(drm_atomic_helper_damage_merged);
> diff --git a/include/drm/drm_damage_helper.h b/include/drm/drm_damage_helper.h
> index 4487660b26b8..40c34a5bf149 100644
> --- a/include/drm/drm_damage_helper.h
> +++ b/include/drm/drm_damage_helper.h
> @@ -78,6 +78,9 @@ drm_atomic_helper_damage_iter_init(struct drm_atomic_helper_damage_iter *iter,
>  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 *old_state,
> +				     struct drm_plane_state *state,
> +				     struct drm_rect *rect);
>  
>  /**
>   * drm_helper_get_plane_damage_clips - Returns damage clips in &drm_rect.
>