diff options
| author | Ben Skeggs | 2013-05-14 05:33:56 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2013-05-20 05:24:09 +0200 |
| commit | b5096566f6e1ee2b88324772f020ae9bc0cfa9a0 (patch) | |
| tree | d59d41001909f622c1e91fb92154f4b30e03ac9f /drivers/gpu/drm/nouveau/core/engine/fifo | |
| parent | drm/nvc0/fifo: prevent CHAN_TABLE_ERROR:CHANNEL_PENDING on fifo fini (diff) | |
| download | kernel-qcow2-linux-b5096566f6e1ee2b88324772f020ae9bc0cfa9a0.tar.gz kernel-qcow2-linux-b5096566f6e1ee2b88324772f020ae9bc0cfa9a0.tar.xz kernel-qcow2-linux-b5096566f6e1ee2b88324772f020ae9bc0cfa9a0.zip | |
drm/nv50/fifo: prevent races between clients updating playlists
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c index ddaeb5572903..89bf459d584b 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c @@ -47,6 +47,7 @@ nv50_fifo_playlist_update(struct nv50_fifo_priv *priv) struct nouveau_gpuobj *cur; int i, p; + mutex_lock(&nv_subdev(priv)->mutex); cur = priv->playlist[priv->cur_playlist]; priv->cur_playlist = !priv->cur_playlist; @@ -60,6 +61,7 @@ nv50_fifo_playlist_update(struct nv50_fifo_priv *priv) nv_wr32(priv, 0x0032f4, cur->addr >> 12); nv_wr32(priv, 0x0032ec, p); nv_wr32(priv, 0x002500, 0x00000101); + mutex_unlock(&nv_subdev(priv)->mutex); } static int |