diff options
| author | Rob Clark <robin.clark@oss.qualcomm.com> | 2026-10-02 08:29:39 -0700 |
|---|---|---|
| committer | Rob Clark <robin.clark@oss.qualcomm.com> | 2026-10-05 06:28:46 -0700 |
| commit | 8eb4e2f0dd77e8a1b62702d1cf676e399689ddc0 (patch) | |
| tree | 9e52e80c4b5b897de18faf58d8d4797b759d3df3 /drivers/gpu | |
| parent | fa0c0504e855b07714b60144e7b6839875312999 (diff) | |
drm/msm/gem: Mmap imported dma-bufs via the exporter
This was always the way it was supposed to work, and when we drop the
page array for imported dma-bufs our fault handling path will no longer
work.
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Patchwork: https://patchwork.freedesktop.org/patch/757703/
Message-ID: <20261002152948.85308-3-robin.clark@oss.qualcomm.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index e8390ebd5dd5..c90336b3b231 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -23,6 +23,8 @@ #include "msm_gpu.h" #include "msm_kms.h" +MODULE_IMPORT_NS("DMA_BUF"); + static void update_device_mem(struct msm_drm_private *priv, ssize_t size) { uint64_t total_mem = atomic64_add_return(size, &priv->total_mem); @@ -338,6 +340,9 @@ static vm_fault_t msm_gem_fault(struct vm_fault *vmf) int err; vm_fault_t ret; + if (drm_WARN_ON_ONCE(obj->dev, drm_gem_is_imported(obj))) + return VM_FAULT_SIGBUS; + /* * vm_ops.open/drm_gem_mmap_obj and close get and put * a reference on obj. So, we dont need to hold one here. @@ -1126,6 +1131,25 @@ static int msm_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct { struct msm_gem_object *msm_obj = to_msm_bo(obj); + if (drm_gem_is_imported(obj)) { + int ret; + + /* Reset both vm_ops and vm_private_data, so we don't end up with + * vm_ops pointing to our implementation if the dma-buf backend + * doesn't set those fields. + */ + vma->vm_private_data = NULL; + vma->vm_ops = NULL; + + ret = dma_buf_mmap(obj->dma_buf, vma, 0); + + /* Drop the reference drm_gem_mmap_obj() acquired.*/ + if (!ret) + drm_gem_object_put(obj); + + return ret; + } + vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); vma->vm_page_prot = msm_gem_pgprot(msm_obj, vma_get_page_prot(vma)); |