openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2016-01-07 13:06:35 -08:00
parent 1d8b0e7908 3bea6a4c78
commit 02006f7a7a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
View File

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