Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c8868d3 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50: fix two potential suspend/resume oopses 



This avoids touching the dummy channel 0/127 we have on nv50.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 054b93e4

drivers/gpu/drm/nouveau/nouveau_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ nouveau_pci_resume(struct pci_dev *pdev) 


		for (i = 0; i < dev_priv->engine.fifo.channels; i++) {

			chan = dev_priv->fifos[i];

			if (!chan)

			if (!chan || !chan->pushbuf_bo)

				continue;



			for (j = 0; j < NOUVEAU_DMA_SKIPS; j++)

drivers/gpu/drm/nouveau/nv50_fifo.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ nv50_fifo_unload_context(struct drm_device *dev) 
	NV_DEBUG(dev, "\n");



	chid = pfifo->channel_id(dev);

	if (chid < 0 || chid >= dev_priv->engine.fifo.channels)

	if (chid < 1 || chid >= dev_priv->engine.fifo.channels - 1)

		return 0;



	chan = dev_priv->fifos[chid];