From: Ralph Campbell <rcampbell@nvidia.com>
To: "Christoph Hellwig" <hch@lst.de>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Jason Gunthorpe" <jgg@mellanox.com>,
"Ben Skeggs" <bskeggs@redhat.com>
Cc: 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: Re: [PATCH 4/9] nouveau: factor out dmem fence completion
Date: Mon, 29 Jul 2019 16:23:18 -0700 [thread overview]
Message-ID: <f2af6247-c935-12de-fb12-e418101efdfa@nvidia.com> (raw)
In-Reply-To: <20190729142843.22320-5-hch@lst.de>
On 7/29/19 7:28 AM, Christoph Hellwig wrote:
> Factor out the end of fencing logic from the two migration routines.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ralph Campbell <rcampbell@nvidia.com>
> ---
> drivers/gpu/drm/nouveau/nouveau_dmem.c | 33 ++++++++++++--------------
> 1 file changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
> index d469bc334438..21052a4aaf69 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
> @@ -133,6 +133,19 @@ static void nouveau_dmem_page_free(struct page *page)
> spin_unlock(&chunk->lock);
> }
>
> +static void nouveau_dmem_fence_done(struct nouveau_fence **fence)
> +{
> + if (fence) {
> + nouveau_fence_wait(*fence, true, false);
> + nouveau_fence_unref(fence);
> + } else {
> + /*
> + * FIXME wait for channel to be IDLE before calling finalizing
> + * the hmem object.
> + */
> + }
> +}
> +
> static void
> nouveau_dmem_fault_alloc_and_copy(struct vm_area_struct *vma,
> const unsigned long *src_pfns,
> @@ -236,15 +249,7 @@ nouveau_dmem_fault_finalize_and_map(struct nouveau_dmem_fault *fault)
> {
> struct nouveau_drm *drm = fault->drm;
>
> - if (fault->fence) {
> - nouveau_fence_wait(fault->fence, true, false);
> - nouveau_fence_unref(&fault->fence);
> - } else {
> - /*
> - * FIXME wait for channel to be IDLE before calling finalizing
> - * the hmem object below (nouveau_migrate_hmem_fini()).
> - */
> - }
> + nouveau_dmem_fence_done(&fault->fence);
>
> while (fault->npages--) {
> dma_unmap_page(drm->dev->dev, fault->dma[fault->npages],
> @@ -748,15 +753,7 @@ nouveau_dmem_migrate_finalize_and_map(struct nouveau_migrate *migrate)
> {
> struct nouveau_drm *drm = migrate->drm;
>
> - if (migrate->fence) {
> - nouveau_fence_wait(migrate->fence, true, false);
> - nouveau_fence_unref(&migrate->fence);
> - } else {
> - /*
> - * FIXME wait for channel to be IDLE before finalizing
> - * the hmem object below (nouveau_migrate_hmem_fini()) ?
> - */
> - }
> + nouveau_dmem_fence_done(&migrate->fence);
>
> while (migrate->dma_nr--) {
> dma_unmap_page(drm->dev->dev, migrate->dma[migrate->dma_nr],
>
next prev parent reply other threads:[~2019-07-29 23:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 14:28 turn the hmm migrate_vma upside down Christoph Hellwig
2019-07-29 14:28 ` [PATCH 1/9] mm: turn " Christoph Hellwig
2019-07-29 23:12 ` Ralph Campbell
2019-07-29 23:43 ` Jerome Glisse
2019-07-31 1:46 ` Ralph Campbell
2019-08-01 7:42 ` 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
2019-07-29 14:28 ` [PATCH 3/9] nouveau: factor out device memory address calculation Christoph Hellwig
2019-07-29 23:21 ` Ralph Campbell
2019-07-29 14:28 ` [PATCH 4/9] nouveau: factor out dmem fence completion Christoph Hellwig
2019-07-29 23:23 ` Ralph Campbell [this message]
2019-07-29 14:28 ` [PATCH 5/9] nouveau: simplify nouveau_dmem_migrate_to_ram Christoph Hellwig
2019-07-29 23:26 ` Ralph Campbell
2019-07-31 9:57 ` Bharata B Rao
2019-08-01 7:46 ` Christoph Hellwig
2019-07-29 14:28 ` [PATCH 6/9] nouveau: simplify nouveau_dmem_migrate_vma Christoph Hellwig
2019-07-29 23:27 ` Ralph Campbell
2019-07-29 14:28 ` [PATCH 7/9] mm: remove the unused MIGRATE_PFN_ERROR flag Christoph Hellwig
2019-07-29 23:29 ` Ralph Campbell
2019-07-29 14:28 ` [PATCH 8/9] mm: remove the unused MIGRATE_PFN_DEVICE flag Christoph Hellwig
2019-07-29 23:31 ` Ralph Campbell
2019-07-29 14:28 ` [PATCH 9/9] mm: remove the MIGRATE_PFN_WRITE flag Christoph Hellwig
2019-07-29 23:30 ` Jerome Glisse
2019-07-30 5:46 ` Christoph Hellwig
2019-07-30 15:51 ` Jerome Glisse
2019-07-29 23:42 ` Ralph Campbell
2019-07-29 23:46 ` Jerome Glisse
2019-07-30 12:32 ` turn the hmm migrate_vma upside down Jason Gunthorpe
2019-07-30 13:09 ` Christoph Hellwig
2019-08-08 15:33 turn hmm migrate_vma upside down v2 Christoph Hellwig
2019-08-08 15:33 ` [PATCH 4/9] nouveau: factor out dmem fence completion Christoph Hellwig
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=f2af6247-c935-12de-fb12-e418101efdfa@nvidia.com \
--to=rcampbell@nvidia.com \
--cc=akpm@linux-foundation.org \
--cc=bharata@linux.ibm.com \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@lst.de \
--cc=jgg@mellanox.com \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nouveau@lists.freedesktop.org \
/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).