From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org, dakr@kernel.org
Subject: [PATCH] nouveau/fence: handle cross device fences properly.
Date: Tue, 7 Jan 2025 15:58:46 +1000 [thread overview]
Message-ID: <20250107055846.536589-1-airlied@gmail.com> (raw)
From: Dave Airlie <airlied@redhat.com>
If we have two nouveau controlled devices and one passes a dma-fence
to the other, when we hit the sync path it can cause the second device
to try and put a sync wait in it's pushbuf for the seqno of the context
on the first device.
Since fence contexts are vmm bound, check the if vmm's match between
both users, this should ensure that fence seqnos don't get used wrongly
on incorrect channels.
This seems to happen fairly spuriously and I found it tracking down
a multi-card regression report, that seems to work by luck before this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/nouveau/nouveau_fence.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index ee5e9d40c166f..5743c82f4094b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -370,7 +370,8 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
rcu_read_lock();
prev = rcu_dereference(f->channel);
- if (prev && (prev == chan ||
+ if (prev && (prev->vmm == chan->vmm) &&
+ (prev == chan ||
fctx->sync(f, prev, chan) == 0))
must_wait = false;
rcu_read_unlock();
--
2.43.0
next reply other threads:[~2025-01-07 6:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 5:58 Dave Airlie [this message]
2025-01-07 6:16 ` [PATCH] nouveau/fence: handle cross device fences properly Ben Skeggs
2025-01-07 16:02 ` Danilo Krummrich
2025-01-08 1:04 ` Dave Airlie
2025-01-08 1:49 ` Ben Skeggs
2025-01-08 7:39 ` Danilo Krummrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250107055846.536589-1-airlied@gmail.com \
--to=airlied@gmail.com \
--cc=dakr@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=nouveau@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.