diff options
| author | Daniel Vetter <[email protected]> | 2017-03-22 21:50:50 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2017-03-29 07:50:38 +0000 |
| commit | 41292b1fa13a894c1108d4a1c7f8a59fbb307aa6 (patch) | |
| tree | cdd761085b4e9e67955bfddb6fd51d0e574d03f2 /drivers/gpu/drm/drm_plane.c | |
| parent | drm: Roll out acquire context for the page_flip ioctl (diff) | |
| download | kernel-41292b1fa13a894c1108d4a1c7f8a59fbb307aa6.tar.gz kernel-41292b1fa13a894c1108d4a1c7f8a59fbb307aa6.zip | |
drm: Add acquire ctx parameter to ->page_flip(_target)
Again just going through the motions, no functional changes in here.
Cc: Gerd Hoffmann <[email protected]>
Cc: Ben Skeggs <[email protected]>
Cc: Russell King <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: Christian König <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>t
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/drm_plane.c')
| -rw-r--r-- | drivers/gpu/drm/drm_plane.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 62e833ffeffd..373e980d698d 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -932,9 +932,11 @@ retry: if (crtc->funcs->page_flip_target) ret = crtc->funcs->page_flip_target(crtc, fb, e, page_flip->flags, - target_vblank); + target_vblank, + &ctx); else - ret = crtc->funcs->page_flip(crtc, fb, e, page_flip->flags); + ret = crtc->funcs->page_flip(crtc, fb, e, page_flip->flags, + &ctx); if (ret) { if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) drm_event_cancel_free(dev, &e->base); |