Commit 02006f7a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 1d8b0e79 3bea6a4c
...@@ -156,6 +156,7 @@ nv40_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch, ...@@ -156,6 +156,7 @@ nv40_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch,
return -ENOMEM; return -ENOMEM;
nvkm_object_ctor(&nv40_gr_chan, oclass, &chan->object); nvkm_object_ctor(&nv40_gr_chan, oclass, &chan->object);
chan->gr = gr; chan->gr = gr;
chan->fifo = fifoch;
*pobject = &chan->object; *pobject = &chan->object;
spin_lock_irqsave(&chan->gr->base.engine.lock, flags); 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