]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/cma-helper: Set VM_DONTEXPAND for mmap
authorRobin Murphy <robin.murphy@arm.com>
Wed, 13 Oct 2021 14:36:54 +0000 (10:36 -0400)
committerAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Fri, 11 Feb 2022 17:11:59 +0000 (12:11 -0500)
drm_gem_cma_mmap() cannot assume every implementation of dma_mmap_wc()
will end up calling remap_pfn_range() (which happens to set the relevant
vma flag, among others), so in order to make sure expectations around
VM_DONTEXPAND are met, let it explicitly set the flag like most other
GEM mmap implementations do.

This avoids repeated warnings on a small minority of systems where the
display is behind an IOMMU, and has a simple driver which does not
override drm_gem_cma_default_funcs. Arm hdlcd is an in-tree affected
driver. Out-of-tree, the Apple DCP driver is affected; this fix is
required for DCP to be mainlined.

[Alyssa: Update commit message.]

Fixes: 51d99ae92a5f ("drm: add mmap() to drm_gem_object_funcs")
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211013143654.39031-1-alyssa@rosenzweig.io
drivers/gpu/drm/drm_gem_cma_helper.c

index cefd0cbf9debb8a4c12fbec61f14cf68537638e4..dc275c466c9cf484611c8cb5282d4ac626b70813 100644 (file)
@@ -512,6 +512,7 @@ int drm_gem_cma_mmap(struct drm_gem_cma_object *cma_obj, struct vm_area_struct *
         */
        vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node);
        vma->vm_flags &= ~VM_PFNMAP;
+       vma->vm_flags |= VM_DONTEXPAND;
 
        if (cma_obj->map_noncoherent) {
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);