Skip to contentSkip to conversation

Patch "drm/nouveau/fifo/nv04: avoid ramht race against cookie insertion" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Oct 4, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/nouveau/fifo/nv04: avoid ramht race against cookie insertion

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-nouveau-fifo-nv04-avoid-ramht-race-against-cookie-insertion.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 666ca3d8f19082f40745d75f3cc7cc0200ee87e3 Mon Sep 17 00:00:00 2001

From: Ilia Mirkin <[email protected]>
Date: Fri, 9 Sep 2016 22:34:02 -0400
Subject: drm/nouveau/fifo/nv04: avoid ramht race against cookie insertion

From: Ilia Mirkin <[email protected]>

commit 666ca3d8f19082f40745d75f3cc7cc0200ee87e3 upstream.

---
 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c +3 -0
@@ -37,7 +37,10 @@ nv04_fifo_dma_object_dtor(struct nvkm_fi
 {
 	struct nv04_fifo_chan *chan = nv04_fifo_chan(base);
 	struct nvkm_instmem *imem = chan->fifo->base.engine.subdev.device->imem;
+
+	mutex_lock(&chan->fifo->base.engine.subdev.mutex);
 	nvkm_ramht_remove(imem->ramht, cookie);
+	mutex_unlock(&chan->fifo->base.engine.subdev.mutex);
 }
 
 static int

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/drm-nouveau-fifo-nv04-avoid-ramht-race-against-cookie-insertion.patch