diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-03-01 16:59:05 +0900 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-03-11 13:00:00 +1000 |
| commit | e0c90fae192e0df7da4341fea86196cfca4f0a0f (patch) | |
| tree | 192b91a4d1febe5f9e1192cd214232578a72cf5d | |
| parent | 94ef3814893c517a44d6194f793bf01ba23a7d84 (diff) | |
| download | nouveau-e0c90fae192e0df7da4341fea86196cfca4f0a0f.tar.gz | |
fifo/gk104: kick channel upon removal
A channel may still be processed by the PBDMA even after removal, unless
it is properly kicked. Some chips are more sensible to this than others,
with GM20B triggering the issue very easily (the PBDMA will try to fetch
methods from the previously-removed channel after a new one is added).
Make sure this cannot happen by kicking the channel right after it is
disabled, and before the new runlist is submitted.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c b/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c index 2e1df01bd..8b4a5e018 100644 --- a/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c +++ b/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c @@ -154,6 +154,7 @@ gk104_fifo_gpfifo_fini(struct nvkm_fifo_chan *base) if (!list_empty(&chan->head)) { gk104_fifo_runlist_remove(fifo, chan); nvkm_mask(device, 0x800004 + coff, 0x00000800, 0x00000800); + gk104_fifo_gpfifo_kick(chan); gk104_fifo_runlist_commit(fifo, chan->engine); } |