From: Dave Airlie <airlied@redhat.com>
Date: Thu, 7 Jan 2016 07:18:45 +0000 (+1000)
Subject: Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: firefly_0821_release~176^2~493^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3bea6a4c7895fc94965a219a8da9bcf753667901;hp=b06f3a168cdcd80026276898fd1fee443ef25743;p=firefly-linux-kernel-4.4.55.git

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
---

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);