drm/nouveau/dmem: empty chunk do not have a buffer object associated with them.

Jérôme Glisse · Ben Skeggs · commit 83857418073f · 2019-03-22T09:58:38.000+10:00
Empty chunk do not have a bo associated with them so no need to pin/unpin
on suspend/resume.

This fix suspend/resume on 5.1rc1 when NOUVEAU_SVM is enabled.

Signed-off-by: Jérôme Glisse &lt;jglisse@redhat.com&gt;
Reviewed-by: Tobias Klausmann &lt;tobias.johannes.klausmann@mni.thm.de&gt;
Tested-by: Tobias Klausmann &lt;tobias.johannes.klausmann@mni.thm.de&gt;
Cc: Ben Skeggs &lt;bskeggs@redhat.com&gt;
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: David Airlie &lt;airlied@linux.ie&gt;
Cc: Daniel Vetter &lt;daniel@ffwll.ch&gt;
Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -454,11 +454,6 @@ nouveau_dmem_resume(struct nouveau_drm *drm)
 		/* FIXME handle pin failure */
 		WARN_ON(ret);
 	}
-	list_for_each_entry (chunk, &drm->dmem->chunk_empty, list) {
-		ret = nouveau_bo_pin(chunk->bo, TTM_PL_FLAG_VRAM, false);
-		/* FIXME handle pin failure */
-		WARN_ON(ret);
-	}
 	mutex_unlock(&drm->dmem->mutex);
 }
 
@@ -477,9 +472,6 @@ nouveau_dmem_suspend(struct nouveau_drm *drm)
 	list_for_each_entry (chunk, &drm->dmem->chunk_full, list) {
 		nouveau_bo_unpin(chunk->bo);
 	}
-	list_for_each_entry (chunk, &drm->dmem->chunk_empty, list) {
-		nouveau_bo_unpin(chunk->bo);
-	}
 	mutex_unlock(&drm->dmem->mutex);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -454,11 +454,6 @@ nouveau_dmem_resume(struct nouveau_drm *drm)`
`454`	`454`	`/* FIXME handle pin failure */`
`455`	`455`	`WARN_ON(ret);`
`456`	`456`	`}`
`457`		`- list_for_each_entry (chunk, &drm->dmem->chunk_empty, list) {`
`458`		`- ret = nouveau_bo_pin(chunk->bo, TTM_PL_FLAG_VRAM, false);`
`459`		`- /* FIXME handle pin failure */`
`460`		`- WARN_ON(ret);`
`461`		`- }`
`462`	`457`	`mutex_unlock(&drm->dmem->mutex);`
`463`	`458`	`}`
`464`	`459`
`@@ -477,9 +472,6 @@ nouveau_dmem_suspend(struct nouveau_drm *drm)`
`477`	`472`	`list_for_each_entry (chunk, &drm->dmem->chunk_full, list) {`
`478`	`473`	`nouveau_bo_unpin(chunk->bo);`
`479`	`474`	`}`
`480`		`- list_for_each_entry (chunk, &drm->dmem->chunk_empty, list) {`
`481`		`- nouveau_bo_unpin(chunk->bo);`
`482`		`- }`
`483`	`475`	`mutex_unlock(&drm->dmem->mutex);`
`484`	`476`	`}`
`485`	`477`