Commit 02006f7a authored Jan 07, 2016 by Linus Torvalds

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

drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);