From 365728dc5d46e133b7ef67e3859843dda708eb20 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 19 Dec 2018 09:29:26 -0800 Subject: [PATCH] v3d: Put the dst bo first in the list of BOs for TFU calls. In the UAPI, the first BO is the destination, and the one the kernel should do an exclusive reservation on. Currently we only do exclusive reservations, anyway. However, in the simulator path I was only copying back the "destination" BO (actually src in this case), and this caused regressions once I fixed the simulator to actually complete TFU before returning (since otherwise, the TFU op would happen at the start of the next CL submit and the draw would get the right contents). Fixes: 976ea90bdca2 ("v3d: Add support for using the TFU to do some blits.") --- src/gallium/drivers/v3d/v3d_blit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/v3d/v3d_blit.c b/src/gallium/drivers/v3d/v3d_blit.c index d6d09570014..7662c63d8fe 100644 --- a/src/gallium/drivers/v3d/v3d_blit.c +++ b/src/gallium/drivers/v3d/v3d_blit.c @@ -386,8 +386,8 @@ v3d_tfu(struct pipe_context *pctx, struct drm_v3d_submit_tfu tfu = { .ios = (height << 16) | width, .bo_handles = { - src->bo->handle, - src != dst ? dst->bo->handle : 0 + dst->bo->handle, + src != dst ? src->bo->handle : 0 }, .in_sync = v3d->out_sync, .out_sync = v3d->out_sync, -- 2.30.2