From: Daniel Vetter <daniel@ffwll.ch>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: sam@ravnborg.org, airlied@linux.ie, emil.l.velikov@gmail.com,
dri-devel@lists.freedesktop.org, kraxel@redhat.com,
sean@poorly.run
Subject: Re: [PATCH 1/2] drm/shmem: Use cached mappings by default
Date: Thu, 14 May 2020 14:40:50 +0200 [thread overview]
Message-ID: <20200514124050.GV206103@phenom.ffwll.local> (raw)
In-Reply-To: <20200513150312.21421-2-tzimmermann@suse.de>
On Wed, May 13, 2020 at 05:03:11PM +0200, Thomas Zimmermann wrote:
> SHMEM-buffer backing storage is allocated from system memory; which is
> typically cachable. Currently, only virtio uses cachable mappings; udl
> uses its own vmap/mmap implementation for cachable mappings. Other
> drivers default to writecombine mappings.
I'm pretty sure this breaks all these drivers. quick grep on a few
functions says this is used by lima, panfrost, v3d. And they definitely
need uncached/wc stuff afaiui. Or I'm completely missing something?
-Daniel
>
> Use cached mappings by default. The exception is pages imported via
> dma-buf. DMA memory is usually not cached.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++--
> drivers/gpu/drm/virtio/virtgpu_object.c | 1 -
> include/drm/drm_gem_shmem_helper.h | 4 ++--
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index df31e5782eed1..1ce90325dfa31 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -259,7 +259,7 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem)
> } else {
> pgprot_t prot = PAGE_KERNEL;
>
> - if (!shmem->map_cached)
> + if (shmem->map_wc)
> prot = pgprot_writecombine(prot);
> shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT,
> VM_MAP, prot);
> @@ -546,7 +546,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
>
> vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
> vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
> - if (!shmem->map_cached)
> + if (shmem->map_wc)
> vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
> vma->vm_ops = &drm_gem_shmem_vm_ops;
>
> @@ -664,6 +664,8 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
> if (IS_ERR(shmem))
> return ERR_CAST(shmem);
>
> + shmem->map_wc = false; /* dma-buf mappings use writecombine */
> +
> shmem->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
> if (!shmem->pages) {
> ret = -ENOMEM;
> diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
> index 6ccbd01cd888c..80ba6b2b61668 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_object.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
> @@ -132,7 +132,6 @@ struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev,
>
> dshmem = &shmem->base.base;
> dshmem->base.funcs = &virtio_gpu_shmem_funcs;
> - dshmem->map_cached = true;
> return &dshmem->base;
> }
>
> diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
> index 294b2931c4cc0..a5bc082a77c48 100644
> --- a/include/drm/drm_gem_shmem_helper.h
> +++ b/include/drm/drm_gem_shmem_helper.h
> @@ -98,9 +98,9 @@ struct drm_gem_shmem_object {
> unsigned int vmap_use_count;
>
> /**
> - * @map_cached: map object cached (instead of using writecombine).
> + * @map_wc: map object using writecombine (instead of cached).
> */
> - bool map_cached;
> + bool map_wc;
> };
>
> #define to_drm_gem_shmem_obj(obj) \
> --
> 2.26.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-14 12:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 15:03 [PATCH 0/2] Default to cachable mappings for GEM SHMEM Thomas Zimmermann
2020-05-13 15:03 ` [PATCH 1/2] drm/shmem: Use cached mappings by default Thomas Zimmermann
2020-05-13 15:06 ` Thomas Zimmermann
2020-05-14 12:40 ` Daniel Vetter [this message]
2020-05-14 15:27 ` Thomas Zimmermann
2020-05-14 20:36 ` Rob Herring
2020-05-15 6:58 ` Thomas Zimmermann
2020-05-15 14:10 ` Daniel Vetter
2020-05-18 8:13 ` Thomas Zimmermann
2020-05-18 8:23 ` Gerd Hoffmann
2020-05-18 8:50 ` Thomas Zimmermann
2020-05-18 10:11 ` Gerd Hoffmann
2020-05-18 14:40 ` Daniel Vetter
2020-05-19 6:31 ` Thomas Zimmermann
2020-05-13 15:03 ` [PATCH 2/2] drm/udl: Use GEM vmap/mmap function from SHMEM helpers Thomas Zimmermann
2020-05-13 15:49 ` Daniel Vetter
2020-05-13 17:19 ` Thomas Zimmermann
2020-05-14 12:44 ` Daniel Vetter
2020-05-19 6:36 ` 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=20200514124050.GV206103@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=kraxel@redhat.com \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--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).