diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-20 07:18:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-20 12:26:26 +1000 |
| commit | fe7acd1e303d74584040a902d78726ba5a4b9b4a (patch) | |
| tree | e5b0c5ecc5cca0db9c9b44526c8b569851b9c9ee /include | |
| parent | f8e6e1b6f0ae3bb91cdcd08213d36a0ce6e98535 (diff) | |
| parent | e84cb605e02f1b3d0aee8d7157419cd8aaa06038 (diff) | |
| download | linux-fe7acd1e303d74584040a902d78726ba5a4b9b4a.tar.bz2 | |
Merge tag 'drm-misc-fixes-2018-10-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Second pull request for v4.19:
- Fix ulong overflow in sun4i
- Fix a serious GPF in waiting for flip_done from commit_tail().
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/97d1ed42-1d99-fcc5-291e-cd1dc29a4252@linux.intel.com
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; }; |