From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Paul Cercueil <paul@crapouillou.net>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Cc: list@opendingux.net, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm: Fix for GEM buffers with write-combine memory
Date: Fri, 28 May 2021 08:59:15 +0300 [thread overview]
Message-ID: <b3ae134e-2494-82ce-d8d2-ca7284129075@ideasonboard.com> (raw)
In-Reply-To: <20210527230334.151947-1-paul@crapouillou.net>
On 28/05/2021 02:03, Paul Cercueil wrote:
> The previous commit wrongly assumed that dma_mmap_wc() could be replaced
> by pgprot_writecombine() + dma_mmap_pages(). It did work on my setup,
> but did not work everywhere.
>
> Use dma_mmap_wc() when the buffer has the write-combine cache attribute,
> and dma_mmap_pages() when it has the non-coherent cache attribute.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> Reported-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> Fixes: cf8ccbc72d61 ("drm: Add support for GEM buffers backed by non-coherent memory")
> ---
> drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
> index 235c7a63da2b..4c3772651954 100644
> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> @@ -514,13 +514,17 @@ int drm_gem_cma_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
>
> cma_obj = to_drm_gem_cma_obj(obj);
>
> - vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
> - if (!cma_obj->map_noncoherent)
> - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
> + if (cma_obj->map_noncoherent) {
> + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
> +
> + ret = dma_mmap_pages(cma_obj->base.dev->dev,
> + vma, vma->vm_end - vma->vm_start,
> + virt_to_page(cma_obj->vaddr));
> + } else {
> + ret = dma_mmap_wc(cma_obj->base.dev->dev, vma, cma_obj->vaddr,
> + cma_obj->paddr, vma->vm_end - vma->vm_start);
>
> - ret = dma_mmap_pages(cma_obj->base.dev->dev,
> - vma, vma->vm_end - vma->vm_start,
> - virt_to_page(cma_obj->vaddr));
> + }
> if (ret)
> drm_gem_vm_close(vma);
>
>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
and
Tested-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Thanks!
Btw, the kernel-doc for drm_gem_cma_create doesn't quite match, as it
says wc is always used.
Tomi
next prev parent reply other threads:[~2021-05-28 5:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-23 17:04 [PATCH v5 0/3] Add option to mmap GEM buffers cached Paul Cercueil
2021-05-23 17:04 ` [PATCH v5 1/3] drm: Add support for GEM buffers backed by non-coherent memory Paul Cercueil
2021-05-27 10:40 ` Tomi Valkeinen
2021-05-27 12:43 ` Paul Cercueil
2021-05-27 23:03 ` [PATCH] drm: Fix for GEM buffers with write-combine memory Paul Cercueil
2021-05-28 5:59 ` Tomi Valkeinen [this message]
2021-05-28 10:10 ` Paul Cercueil
2021-05-23 17:04 ` [PATCH v5 2/3] drm: Add and export function drm_fb_cma_sync_non_coherent Paul Cercueil
2021-05-23 18:40 ` kernel test robot
2021-05-23 17:04 ` [PATCH v5 3/3] drm/ingenic: Add option to alloc cached GEM buffers Paul Cercueil
2021-05-23 19:05 ` [PATCH v5 0/3] Add option to mmap GEM buffers cached Thomas Zimmermann
2021-05-23 19:19 ` Paul Cercueil
2021-05-25 10:03 ` Thomas Zimmermann
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=b3ae134e-2494-82ce-d8d2-ca7284129075@ideasonboard.com \
--to=tomi.valkeinen@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=list@opendingux.net \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=paul@crapouillou.net \
--cc=tzimmermann@suse.de \
/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).