system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-26 13:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: nv84+: fix fence context seqno's

Browse source 
This fixes a regression introduced by "drm/nouveau: rework to new fence interface"
(commit 29ba89b237).

The fence sequence should not be reset after creation, the old value is used instead.
On destruction the final value is written, to prevent another source of accidental
wraparound in case of a channel being destroyed after a hang, and unblocking any other
channel that may wait on the about-to-be-deleted channel to signal.

I'm nothing if not optimistic about any hope of recovery from that. ;-)

Reported-by: Ted Percival <ted@tedp.id.au>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Ted Percival <ted@tedp.id.au>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Maarten Lankhorst 2014-09-22 11:08:48 +02:00 committed by Dave Airlie
parent d743ecf360
commit 1dadba87cb
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/nv84_fence.c
View file

@ -120,6 +120,7 @@ nv84_fence_context_del(struct nouveau_channel *chan)
nouveau_bo_vma_del(bo, &fctx->dispc_vma[i]); nouveau_bo_vma_del(bo, &fctx->dispc_vma[i]);
} }
nouveau_bo_wr32(priv->bo, chan->chid * 16 / 4, fctx->base.sequence);
nouveau_bo_vma_del(priv->bo, &fctx->vma_gart); nouveau_bo_vma_del(priv->bo, &fctx->vma_gart);
nouveau_bo_vma_del(priv->bo, &fctx->vma); nouveau_bo_vma_del(priv->bo, &fctx->vma);
nouveau_fence_context_del(&fctx->base); nouveau_fence_context_del(&fctx->base);
@ -159,8 +160,6 @@ nv84_fence_context_new(struct nouveau_channel *chan)
ret = nouveau_bo_vma_add(bo, cli->vm, &fctx->dispc_vma[i]); ret = nouveau_bo_vma_add(bo, cli->vm, &fctx->dispc_vma[i]);
} }
nouveau_bo_wr32(priv->bo, chan->chid * 16/4, 0x00000000);
if (ret) if (ret)
nv84_fence_context_del(chan); nv84_fence_context_del(chan);
return ret; return ret;