From: Christoph Hellwig <hch@lst.de>
To: "Jérôme Glisse" <jglisse@redhat.com>,
"Jason Gunthorpe" <jgg@mellanox.com>,
"Ben Skeggs" <bskeggs@redhat.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>,
Bharata B Rao <bharata@linux.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, nouveau@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/9] nouveau: reset dma_nr in nouveau_dmem_migrate_alloc_and_copy
Date: Thu, 8 Aug 2019 18:33:39 +0300 [thread overview]
Message-ID: <20190808153346.9061-3-hch@lst.de> (raw)
In-Reply-To: <20190808153346.9061-1-hch@lst.de>
When we start a new batch of dma_map operations we need to reset dma_nr,
as we start filling a newly allocated array.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ralph Campbell <rcampbell@nvidia.com>
---
drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 +
1 file changed, 1 insertion(+)
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;
--
2.20.1
next prev parent reply other threads:[~2019-08-08 15:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-08 15:33 turn hmm migrate_vma upside down v2 Christoph Hellwig
2019-08-08 15:33 ` [PATCH 1/9] mm: turn migrate_vma upside down Christoph Hellwig
2019-08-08 15:33 ` Christoph Hellwig [this message]
2019-08-08 15:33 ` [PATCH 3/9] nouveau: factor out device memory address calculation Christoph Hellwig
2019-08-08 15:33 ` [PATCH 4/9] nouveau: factor out dmem fence completion Christoph Hellwig
2019-08-08 15:33 ` [PATCH 5/9] nouveau: remove a few function stubs Christoph Hellwig
2019-08-08 15:33 ` [PATCH 6/9] nouveau: simplify nouveau_dmem_migrate_to_ram Christoph Hellwig
2019-08-08 21:10 ` Ralph Campbell
2019-08-10 11:08 ` Christoph Hellwig
2019-08-08 15:33 ` [PATCH 7/9] nouveau: simplify nouveau_dmem_migrate_vma Christoph Hellwig
2019-08-08 15:33 ` [PATCH 8/9] mm: remove the unused MIGRATE_PFN_ERROR flag Christoph Hellwig
2019-08-08 15:33 ` [PATCH 9/9] mm: remove the unused MIGRATE_PFN_DEVICE flag Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2019-07-29 14:28 turn the hmm migrate_vma upside down Christoph Hellwig
2019-07-29 14:28 ` [PATCH 2/9] nouveau: reset dma_nr in nouveau_dmem_migrate_alloc_and_copy Christoph Hellwig
2019-07-29 23:18 ` Ralph Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190808153346.9061-3-hch@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=bharata@linux.ibm.com \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@mellanox.com \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nouveau@lists.freedesktop.org \
--cc=rcampbell@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).