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 <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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 6b43918035df543f3bea2a8b305ae249ae7102b5..05d0b3eb36904feb7c3da290cc4b37f6af56007e 100644 (file)
--- 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;