diff options
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index cc6e2772b32f..96561ecf736f 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c | |||
@@ -2859,6 +2859,7 @@ static int page_flip_common( | |||
2859 | * @fb: DRM framebuffer | 2859 | * @fb: DRM framebuffer |
2860 | * @event: optional DRM event to signal upon completion | 2860 | * @event: optional DRM event to signal upon completion |
2861 | * @flags: flip flags for non-vblank sync'ed updates | 2861 | * @flags: flip flags for non-vblank sync'ed updates |
2862 | * @ctx: lock acquisition context | ||
2862 | * | 2863 | * |
2863 | * Provides a default &drm_crtc_funcs.page_flip implementation | 2864 | * Provides a default &drm_crtc_funcs.page_flip implementation |
2864 | * using the atomic driver interface. | 2865 | * using the atomic driver interface. |
@@ -2872,7 +2873,8 @@ static int page_flip_common( | |||
2872 | int drm_atomic_helper_page_flip(struct drm_crtc *crtc, | 2873 | int drm_atomic_helper_page_flip(struct drm_crtc *crtc, |
2873 | struct drm_framebuffer *fb, | 2874 | struct drm_framebuffer *fb, |
2874 | struct drm_pending_vblank_event *event, | 2875 | struct drm_pending_vblank_event *event, |
2875 | uint32_t flags) | 2876 | uint32_t flags, |
2877 | struct drm_modeset_acquire_ctx *ctx) | ||
2876 | { | 2878 | { |
2877 | struct drm_plane *plane = crtc->primary; | 2879 | struct drm_plane *plane = crtc->primary; |
2878 | struct drm_atomic_state *state; | 2880 | struct drm_atomic_state *state; |
@@ -2920,6 +2922,7 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip); | |||
2920 | * @event: optional DRM event to signal upon completion | 2922 | * @event: optional DRM event to signal upon completion |
2921 | * @flags: flip flags for non-vblank sync'ed updates | 2923 | * @flags: flip flags for non-vblank sync'ed updates |
2922 | * @target: specifying the target vblank period when the flip to take effect | 2924 | * @target: specifying the target vblank period when the flip to take effect |
2925 | * @ctx: lock acquisition context | ||
2923 | * | 2926 | * |
2924 | * Provides a default &drm_crtc_funcs.page_flip_target implementation. | 2927 | * Provides a default &drm_crtc_funcs.page_flip_target implementation. |
2925 | * Similar to drm_atomic_helper_page_flip() with extra parameter to specify | 2928 | * Similar to drm_atomic_helper_page_flip() with extra parameter to specify |
@@ -2933,7 +2936,8 @@ int drm_atomic_helper_page_flip_target( | |||
2933 | struct drm_framebuffer *fb, | 2936 | struct drm_framebuffer *fb, |
2934 | struct drm_pending_vblank_event *event, | 2937 | struct drm_pending_vblank_event *event, |
2935 | uint32_t flags, | 2938 | uint32_t flags, |
2936 | uint32_t target) | 2939 | uint32_t target, |
2940 | struct drm_modeset_acquire_ctx *ctx) | ||
2937 | { | 2941 | { |
2938 | struct drm_plane *plane = crtc->primary; | 2942 | struct drm_plane *plane = crtc->primary; |
2939 | struct drm_atomic_state *state; | 2943 | struct drm_atomic_state *state; |