Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41292b1f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Add acquire ctx parameter to ->page_flip(_target) 



Again just going through the motions, no functional changes in here.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com&gt;t>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-12-daniel.vetter@ffwll.ch
parent 29dc0d1d

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+2 −1
Original line number Diff line number Diff line
@@ -311,7 +311,8 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, 
				 struct drm_framebuffer *fb,

				 struct drm_pending_vblank_event *event,

				 uint32_t page_flip_flags,

				 uint32_t target)

				 uint32_t target,

				 struct drm_modeset_acquire_ctx *ctx)

{

	struct amdgpu_bo *new_abo;

	struct amdgpu_flip_work *work;

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+2 −1
Original line number Diff line number Diff line
@@ -594,7 +594,8 @@ int amdgpu_crtc_set_config(struct drm_mode_set *set); 
int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_pending_vblank_event *event,

				 uint32_t page_flip_flags, uint32_t target);

				 uint32_t page_flip_flags, uint32_t target,

				 struct drm_modeset_acquire_ctx *ctx);

void amdgpu_crtc_cleanup_flip_ctx(struct amdgpu_flip_work *work,

				  struct amdgpu_bo *new_abo);

int amdgpu_crtc_prepare_flip(struct drm_crtc *crtc,

drivers/gpu/drm/armada/armada_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,8 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc) 
 * and a mode_set.

 */

static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,

	struct drm_framebuffer *fb, struct drm_pending_vblank_event *event, uint32_t page_flip_flags)

	struct drm_framebuffer *fb, struct drm_pending_vblank_event *event, uint32_t page_flip_flags,

	struct drm_modeset_acquire_ctx *ctx)

{

	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);

	struct armada_frame_work *work;

drivers/gpu/drm/bochs/bochs_kms.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ static void bochs_crtc_commit(struct drm_crtc *crtc) 
static int bochs_crtc_page_flip(struct drm_crtc *crtc,

				struct drm_framebuffer *fb,

				struct drm_pending_vblank_event *event,

				uint32_t page_flip_flags)

				uint32_t page_flip_flags,

				struct drm_modeset_acquire_ctx *ctx)

{

	struct bochs_device *bochs =

		container_of(crtc, struct bochs_device, crtc);

drivers/gpu/drm/drm_atomic_helper.c

+6 −2
Original line number Diff line number Diff line
@@ -2859,6 +2859,7 @@ static int page_flip_common( 
 * @fb: DRM framebuffer

 * @event: optional DRM event to signal upon completion

 * @flags: flip flags for non-vblank sync'ed updates

 * @ctx: lock acquisition context

 *

 * Provides a default &drm_crtc_funcs.page_flip implementation

 * using the atomic driver interface.
@@ -2872,7 +2873,8 @@ static int page_flip_common( 
int drm_atomic_helper_page_flip(struct drm_crtc *crtc,

				struct drm_framebuffer *fb,

				struct drm_pending_vblank_event *event,

				uint32_t flags)

				uint32_t flags,

				struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_plane *plane = crtc->primary;

	struct drm_atomic_state *state;
@@ -2920,6 +2922,7 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip); 
 * @event: optional DRM event to signal upon completion

 * @flags: flip flags for non-vblank sync'ed updates

 * @target: specifying the target vblank period when the flip to take effect

 * @ctx: lock acquisition context

 *

 * Provides a default &drm_crtc_funcs.page_flip_target implementation.

 * Similar to drm_atomic_helper_page_flip() with extra parameter to specify
@@ -2933,7 +2936,8 @@ int drm_atomic_helper_page_flip_target( 
				struct drm_framebuffer *fb,

				struct drm_pending_vblank_event *event,

				uint32_t flags,

				uint32_t target)

				uint32_t target,

				struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_plane *plane = crtc->primary;

	struct drm_atomic_state *state;