projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b06f3a1
)
Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
author
Dave Airlie
<airlied@redhat.com>
Thu, 7 Jan 2016 07:18:45 +0000
(17:18 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 7 Jan 2016 07:18:45 +0000
(17:18 +1000)
single nv40 oops fix.
* 'linux-4.4' of git://github.com/skeggsb/linux:
drm/nouveau/gr/nv40: fix oops in interrupt handler
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
index ffa902ece87234420d2b25d1603995f5679b5245..05a895496fc66f6f96efd64cbdbe822e4baaf1cc 100644
(file)
--- 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);