summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_atomic.h
diff options
context:
space:
mode:
authorMaarten Lankhorst2016-12-15 12:51:42 +0100
committerDaniel Vetter2016-12-19 16:41:47 +0100
commitbdc571464c49740ce56c56e108d60f825336eb89 (patch)
tree3f9048f95d1fcc1e8e4ace3bfe9873f571d8a89b /include/drm/drm_atomic.h
parentdrm/atomic: Unconditionally call prepare_fb. (diff)
downloadkernel-qcow2-linux-bdc571464c49740ce56c56e108d60f825336eb89.tar.gz
kernel-qcow2-linux-bdc571464c49740ce56c56e108d60f825336eb89.tar.xz
kernel-qcow2-linux-bdc571464c49740ce56c56e108d60f825336eb89.zip
drm/atomic: Clean up wait_for_vblanks, v2.
Stop relying on a per crtc_state last_vblank_count, we shouldn't touch crtc_state after commit. Move it to atomic_state->crtcs. Also stop re-using new_crtc_state->enable, we can now simply set a bitmask with crtc_crtc_mask. Changes since v1: - Keep last_vblank_count in __drm_crtc_state. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/8e4759a4-24d3-3f80-bd1a-1e7a9c83b612@linux.intel.com
Diffstat (limited to 'include/drm/drm_atomic.h')
-rw-r--r--include/drm/drm_atomic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index b74f04c49713..8cc7ca2079fb 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -145,6 +145,7 @@ struct __drm_crtcs_state {
struct drm_crtc_state *state;
struct drm_crtc_commit *commit;
s64 __user *out_fence_ptr;
+ unsigned last_vblank_count;
};
struct __drm_connnectors_state {