aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-07 13:06:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-07 13:06:35 -0800
commit02006f7a7a715af10974a30b7ad8e6ee340f954c (patch)
treeb2b570b740e0f1e2ac5c754d955802d6584e20c6
parent1d8b0e79083d229829a408cd016dc4a038f637dd (diff)
parent3bea6a4c7895fc94965a219a8da9bcf753667901 (diff)
downloadleg-kernel-02006f7a7a715af10974a30b7ad8e6ee340f954c.tar.gz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm nouveau fix from Dave Airlie: "Still not back to work, but I decided to forward this fix" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/nouveau/gr/nv40: fix oops in interrupt handler
-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);