summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-11-20 09:44:50 +1000
committerDave Airlie <airlied@redhat.com>2015-11-20 09:44:50 +1000
commitdb3956372f086eaf1c079dc12c3f03ae9f306ba5 (patch)
treee5d8d6d001790fd9601b1129da843f1c280c1a8a /include
parentf6619ef7508261be2ba3ded313ccc46ce670d0d3 (diff)
parent5481c8fb1da2a573861095fbea078f30c664d0bd (diff)
downloadlinux-db3956372f086eaf1c079dc12c3f03ae9f306ba5.tar.gz
linux-db3956372f086eaf1c079dc12c3f03ae9f306ba5.tar.bz2
linux-db3956372f086eaf1c079dc12c3f03ae9f306ba5.zip
Merge tag 'topic/drm-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Here are some drm core fixes for v4.4 that I've picked up. Atomic fixes from Maarten, and atomic helper fixes from Ville and Daniel. Admittedly the topmost commit didn't sit in our tree for very long, but does come with reviews and testing from trustworthy people. * tag 'topic/drm-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel: drm/atomic-helper: Check encoder/crtc constraints drm: Fix primary plane size for stereo doubled modes for legacy setcrtc drm/core: Fix old_fb handling in pan_display_atomic. drm/core: Fix old_fb handling in restore_fbdev_mode_atomic. drm/atomic: add a drm_atomic_clean_old_fb helper. drm/core: Fix old_fb handling in drm_mode_atomic_ioctl. drm/core: Set legacy_cursor_update in drm_atomic_helper_disable_plane.
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_atomic.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index e67aeac2aee0..4b74c97d297a 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -136,6 +136,9 @@ drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,
void drm_atomic_legacy_backoff(struct drm_atomic_state *state);
+void
+drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret);
+
int __must_check drm_atomic_check_only(struct drm_atomic_state *state);
int __must_check drm_atomic_commit(struct drm_atomic_state *state);
int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);