diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-27 03:16:56 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-27 03:16:56 +0300 |
| commit | 99f300cf1f3877ad8ea923127de817a460b787bd (patch) | |
| tree | 8d58a6b013c8c747354920c892d6920fc4a3d13f /include/drm | |
| parent | ff9f8a7cf935468a94d9927c68b00daae701667e (diff) | |
| parent | 7e9081c5aac73b8a0bc22e0b3e7a12c3e9cf5256 (diff) | |
| download | linux-99f300cf1f3877ad8ea923127de817a460b787bd.tar.xz | |
Merge tag 'drm-misc-fixes-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Single fence fix.
* tag 'drm-misc-fixes-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc:
drm/fence: fix memory overwrite when setting out_fence fd
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_atomic.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_mode_config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index d6d241f63b9f..56814e8ae7ea 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -144,7 +144,7 @@ struct __drm_crtcs_state { struct drm_crtc *ptr; struct drm_crtc_state *state; struct drm_crtc_commit *commit; - s64 __user *out_fence_ptr; + s32 __user *out_fence_ptr; }; struct __drm_connnectors_state { diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index bf9991b20611..137432386310 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -488,7 +488,7 @@ struct drm_mode_config { /** * @prop_out_fence_ptr: Sync File fd pointer representing the * outgoing fences for a CRTC. Userspace should provide a pointer to a - * value of type s64, and then cast that pointer to u64. + * value of type s32, and then cast that pointer to u64. */ struct drm_property *prop_out_fence_ptr; /** |