diff options
| author | Daniel Vetter | 2017-03-22 22:50:41 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2017-03-29 09:14:01 +0200 |
| commit | 34a2ab5e0689e5174dd50e4a96e73c1c00539fdb (patch) | |
| tree | d939da923dc12b7d8cfc19c5600b0791f9922167 /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | drm: Wire up proper acquire ctx for plane functions (diff) | |
| download | kernel-qcow2-linux-34a2ab5e0689e5174dd50e4a96e73c1c00539fdb.tar.gz kernel-qcow2-linux-34a2ab5e0689e5174dd50e4a96e73c1c00539fdb.tar.xz kernel-qcow2-linux-34a2ab5e0689e5174dd50e4a96e73c1c00539fdb.zip | |
drm: Add acquire ctx parameter to ->update_plane
Just rolling it out, no code change here.
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-3-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index c3ace44e1c8e..e552687dcac6 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2077,6 +2077,7 @@ EXPORT_SYMBOL(drm_atomic_helper_swap_state); * @src_y: y offset of @fb for panning * @src_w: width of source rectangle in @fb * @src_h: height of source rectangle in @fb + * @ctx: lock acquire context * * Provides a default plane update handler using the atomic driver interface. * @@ -2089,7 +2090,8 @@ int drm_atomic_helper_update_plane(struct drm_plane *plane, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h) + uint32_t src_w, uint32_t src_h, + struct drm_modeset_acquire_ctx *ctx) { struct drm_atomic_state *state; struct drm_plane_state *plane_state; |