summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_dmem.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-08-14 10:59:20 +0300
committerJason Gunthorpe <jgg@mellanox.com>2019-08-20 15:35:03 +0300
commitdea027f28209aa7a23a4e56b2ae270f16d48055d (patch)
tree7a25b4f333ec6dc8972d65338c57abbd3f6084f5 /drivers/gpu/drm/nouveau/nouveau_dmem.c
parenta7d1f22bb74f32cf3cd93f52776007e161f1a738 (diff)
downloadlinux-dea027f28209aa7a23a4e56b2ae270f16d48055d.tar.xz
nouveau: reset dma_nr in nouveau_dmem_migrate_alloc_and_copy
When we start a new batch of dma_map operations we need to reset dma_nr, as we start filling a newly allocated array. Link: https://lore.kernel.org/r/20190814075928.23766-3-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ralph Campbell <rcampbell@nvidia.com> Tested-by: Ralph Campbell <rcampbell@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dmem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dmem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index 38416798abd4..e696157f771e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -682,6 +682,7 @@ nouveau_dmem_migrate_alloc_and_copy(struct vm_area_struct *vma,
migrate->dma = kmalloc(sizeof(*migrate->dma) * npages, GFP_KERNEL);
if (!migrate->dma)
goto error;
+ migrate->dma_nr = 0;
/* Copy things over */
copy = drm->dmem->migrate.copy_func;