summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2021-06-06 11:50:15 +0200
committerChristian König <christian.koenig@amd.com>2021-07-08 14:59:08 +0200
commit3e1ad79bf66165bdb2baca3989f9227939241f11 (patch)
tree95855f155ed3aca1a5b159e431e5c36c54b99111
parent9d38814d1e346ea37a51cbf31f4424c9d059459e (diff)
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
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_fence.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 6b43918035df..05d0b3eb3690 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;