aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-01-07 17:18:45 +1000
committerDave Airlie <airlied@redhat.com>2016-01-07 17:18:45 +1000
commit3bea6a4c7895fc94965a219a8da9bcf753667901 (patch)
tree1938d3793ba2238bfdd817f5985e57a91156b2a1
parentb06f3a168cdcd80026276898fd1fee443ef25743 (diff)
parent9daf38f4fcca509d198fa4184760d55cd30a7b31 (diff)
downloadleg-kernel-3bea6a4c7895fc94965a219a8da9bcf753667901.tar.gz
Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
single nv40 oops fix. * 'linux-4.4' of git://github.com/skeggsb/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);