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

Commit aee25864 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Daniel Vetter
Browse files

drm/imx: use drm_atomic_set_fence_for_plane() to set the fence 



drm_atomic_set_fence_for_plane() is smart and won't overwrite
plane_state->fence if the user already set an explicit fence there.

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1478513013-3221-2-git-send-email-gustavo@padovan.org
parent 13b55664

drivers/gpu/drm/imx/imx-drm-core.c

+4 −2
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int imx_drm_atomic_commit(struct drm_device *dev, 
	struct drm_plane_state *plane_state;

	struct drm_plane *plane;

	struct dma_buf *dma_buf;

	struct dma_fence *fence;

	int i;



	/*
@@ -170,8 +171,9 @@ static int imx_drm_atomic_commit(struct drm_device *dev, 
							 0)->base.dma_buf;

			if (!dma_buf)

				continue;

			plane_state->fence =

				reservation_object_get_excl_rcu(dma_buf->resv);

			fence = reservation_object_get_excl_rcu(dma_buf->resv);



			drm_atomic_set_fence_for_plane(plane_state, fence);

		}

	}