Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/cma-helper: Set VM_DONTEXPAND for mmap

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: c40069cb7bd6 ("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

authored by

Robin Murphy and committed by
Alyssa Rosenzweig
59f39bfa 9da1e9ab

+1
+1
drivers/gpu/drm/drm_gem_cma_helper.c
··· 512 512 */ 513 513 vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node); 514 514 vma->vm_flags &= ~VM_PFNMAP; 515 + vma->vm_flags |= VM_DONTEXPAND; 515 516 516 517 if (cma_obj->map_noncoherent) { 517 518 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);