summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-11-07 11:03:30 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-11-08 11:22:54 +0100
commit13b55664eec7b85607c4ab9d26a62b4af413a771 (patch)
tree97a0790c062714f8fe8a4a5fc462d835bd370ddf /include/drm
parentdrm: don't override possible_crtcs for primary/cursor planes (diff)
downloadlinux-13b55664eec7b85607c4ab9d26a62b4af413a771.tar.xz
linux-13b55664eec7b85607c4ab9d26a62b4af413a771.zip
drm/atomic: add drm_atomic_set_fence_for_plane()
This new function should be used by drivers when setting a implicit fence for the plane. It abstracts the fact that the user might have chosen explicit fencing instead. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1478513013-3221-1-git-send-email-gustavo@padovan.org
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_atomic.h2
-rw-r--r--include/drm/drm_plane.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index fc8af53b18aa..2d1e9c944b54 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -345,6 +345,8 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
struct drm_crtc *crtc);
void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state,
struct drm_framebuffer *fb);
+void drm_atomic_set_fence_for_plane(struct drm_plane_state *plane_state,
+ struct dma_fence *fence);
int __must_check
drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
struct drm_crtc *crtc);
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index c5e8a0df1623..68f6d221a3da 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -59,7 +59,7 @@ struct drm_plane_state {
struct drm_crtc *crtc; /* do not write directly, use drm_atomic_set_crtc_for_plane() */
struct drm_framebuffer *fb; /* do not write directly, use drm_atomic_set_fb_for_plane() */
- struct dma_fence *fence;
+ struct dma_fence *fence; /* do not write directly, use drm_atomic_set_fence_for_plane() */
/* Signed dest location allows it to be partially off screen */
int32_t crtc_x, crtc_y;