drm_gem_object_funcs->vm_ops alone can't handle
everything mmap() needs. Add a new callback for it.
Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
---
include/drm/drm_gem.h | 9 +++++++++
drivers/gpu/drm/drm_gem.c | 6 ++++++
2 files changed, 15 insertions(+)
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index ae693c0666cd..ee3c4ad742c6 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -150,6 +150,15 @@ struct drm_gem_object_funcs {
*/
void (*vunmap)(struct drm_gem_object *obj, void *vaddr);
+ /**
+ * @mmap:
+ *
+ * Called by drm_gem_mmap() for additional checks/setup.
+ *
+ * This callback is optional.
+ */
+ int (*mmap)(struct drm_gem_object *obj, struct vm_area_struct *vma);
+
/**
* @vm_ops:
*
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index afc38cece3f5..84db8de217e1 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1105,6 +1105,8 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
vma->vm_ops = obj->funcs->vm_ops;
else if (dev->driver->gem_vm_ops)
vma->vm_ops = dev->driver->gem_vm_ops;
+ else if (obj->funcs && obj->funcs->mmap)
+ /* obj->funcs->mmap must set vma->vm_ops */;
else
return -EINVAL;
@@ -1192,6 +1194,10 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT,
vma);
+ if (ret == 0)
+ if (obj->funcs->mmap)
+ ret = obj->funcs->mmap(obj, vma);
+
drm_gem_object_put_unlocked(obj);
return ret;
--
2.18.1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
