From: Christian König Date: Sun, 6 Jun 2021 09:50:15 +0000 (+0200) Subject: drm/nouveau: always wait for the exclusive fence X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e1ad79bf66165bdb2baca3989f9227939241f11;p=linux.git drm/nouveau: always wait for the exclusive fence Drivers also need to to sync to the exclusive fence when a shared one is present. Signed-off-by: Christian König Reviewed-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20210702111642.17259-4-christian.koenig@amd.com --- diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 6b43918035df5..05d0b3eb36904 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -358,7 +358,7 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e fobj = dma_resv_shared_list(resv); fence = dma_resv_excl_fence(resv); - if (fence && (!exclusive || !fobj || !fobj->shared_count)) { + if (fence) { struct nouveau_channel *prev = NULL; bool must_wait = true;