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

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
This commit is contained in:
Dave Airlie 2016-01-07 17:18:45 +10:00
parent b06f3a168c 9daf38f4fc
commit 3bea6a4c78
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);