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

Commit 334dbd69 authored by Eric Anholt's avatar Eric Anholt
Browse files

drm/vc4: Hook up plane prepare_fb to lookup dma-buf reservations. 



This way drm_atomic_helper_wait_for_fences() will actually do
something.  The vc4_seqno_cb has been doing the fence waits on V3D
manually, so far.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170621185002.28563-1-eric@anholt.net


Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 7d2818f5

drivers/gpu/drm/vc4/vc4_plane.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -759,9 +759,26 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, struct drm_framebuffer *fb) 
	vc4_state->dlist[vc4_state->ptr0_offset] = addr;

	vc4_state->dlist[vc4_state->ptr0_offset] = addr;

}

}





static int vc4_prepare_fb(struct drm_plane *plane,

			  struct drm_plane_state *state)

{

	struct vc4_bo *bo;

	struct dma_fence *fence;



	if ((plane->state->fb == state->fb) || !state->fb)

		return 0;



	bo = to_vc4_bo(&drm_fb_cma_get_gem_obj(state->fb, 0)->base);

	fence = reservation_object_get_excl_rcu(bo->resv);

	drm_atomic_set_fence_for_plane(state, fence);



	return 0;

}



static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {

static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {

	.atomic_check = vc4_plane_atomic_check,

	.atomic_check = vc4_plane_atomic_check,

	.atomic_update = vc4_plane_atomic_update,

	.atomic_update = vc4_plane_atomic_update,

	.prepare_fb = vc4_prepare_fb,

};

};





static void vc4_plane_destroy(struct drm_plane *plane)

static void vc4_plane_destroy(struct drm_plane *plane)