diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a (patch) | |
tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 /include | |
parent | d92060bc69233a8175a0c2bfa0d2bce123cace2d (diff) | |
parent | 23469de647c4c7b68b5d135927b1c509f0e757e6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David Ahern's dump indexing bug fix in 'net' overlapped the
change of the function signature of inet6_fill_ifaddr() in
'net-next'. Trivially resolved.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm_atomic.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index da9d95a19580..1e713154f00e 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -153,6 +153,17 @@ struct __drm_planes_state { struct __drm_crtcs_state { struct drm_crtc *ptr; struct drm_crtc_state *state, *old_state, *new_state; + + /** + * @commit: + * + * A reference to the CRTC commit object that is kept for use by + * drm_atomic_helper_wait_for_flip_done() after + * drm_atomic_helper_commit_hw_done() is called. This ensures that a + * concurrent commit won't free a commit object that is still in use. + */ + struct drm_crtc_commit *commit; + s32 __user *out_fence_ptr; u64 last_vblank_count; }; |