Commit 3bea6a4c authored by Dave Airlie's avatar Dave Airlie

Merge branch 'linux-4.4' of git:// into drm-fixes

single nv40 oops fix.

* 'linux-4.4' of git://
  drm/nouveau/gr/nv40: fix oops in interrupt handler
parents b06f3a16 9daf38f4
......@@ -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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment