diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-01-24 12:52:46 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-01-24 13:02:12 +0300 |
| commit | f91168f48556486743392b8838e20afbd84b7b7a (patch) | |
| tree | 34fae57254349a9d908eff729a8e1cb6b933475a /include/drm/drm_damage_helper.h | |
| parent | 8ca4fd0406b41a872055048d694f3702d8eddb76 (diff) | |
| parent | 46f3ceaffa81e846677bca8668e0ad40e643cffd (diff) | |
| download | linux-f91168f48556486743392b8838e20afbd84b7b7a.tar.xz | |
Merge tag 'drm-misc-next-2019-01-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.1:
UAPI Changes:
- Addition of the Allwinner tiled format modifier
Cross-subsystem Changes:
Core Changes:
- dma-buf documentation improvements
- Removal of now unused fbdev helpers
- Addition of new drm fbdev helpers
- Improvements to tinydrm
- Addition of new drm_fourcc helpers
- Impromevents to i2c-over-aux to handle I2C_M_STOP
Driver Changes:
- Add support for the TI DS90C185 LVDS bridge
- Improvements to the thc63lvdm83d bridge
- Improvements to sun4i YUV and scaler support
- Fix to the powerdown sequence of panel-innolux
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190123110317.h4tovujaydo2bfz2@flea
Diffstat (limited to 'include/drm/drm_damage_helper.h')
| -rw-r--r-- | include/drm/drm_damage_helper.h | 3 |
1 files changed, 3 insertions, 0 deletions
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. |