diff options
| -rw-r--r-- | drivers/gpu/drm/drm_damage_helper.c | 41 | ||||
| -rw-r--r-- | include/drm/drm_damage_helper.h | 3 | 
2 files changed, 44 insertions, 0 deletions
| diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index 31032407254d..e16aa5ae00b4 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -333,3 +333,44 @@ 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. + * + * 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; +	} + +	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. |