summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-01-04 00:01:13 +0100
committerBen Skeggs <bskeggs@redhat.com>2016-01-04 22:51:18 +0100
commit9daf38f4fcca509d198fa4184760d55cd30a7b31 (patch)
tree269e71b4ca509d498f758b7cf49dfe8756011f39
parentdrm/nouveau/bios/fan: hardcode the fan mode to linear (diff)
downloadlinux-9daf38f4fcca509d198fa4184760d55cd30a7b31.tar.xz
linux-9daf38f4fcca509d198fa4184760d55cd30a7b31.zip
drm/nouveau/gr/nv40: fix oops in interrupt handler
fdo#93557 Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
index ffa902ece872..05a895496fc6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
@@ -156,6 +156,7 @@ nv40_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch,
return -ENOMEM;
nvkm_object_ctor(&nv40_gr_chan, oclass, &chan->object);
chan->gr = gr;
+ chan->fifo = fifoch;
*pobject = &chan->object;
spin_lock_irqsave(&chan->gr->base.engine.lock, flags);