Explorar o código

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
Dave Airlie %!s(int64=10) %!d(string=hai) anos
pai
achega
3bea6a4c78
Modificáronse 1 ficheiros con 1 adicións e 0 borrados
  1. 1 0
      drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c

+ 1 - 0
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);