drm: rework mmap() workflow
Subsystems (13)
Gerd Hoffmann
maintainerv4 cover drm: rework mmap() workflow
Add mmap callback to struct drm_gem_object_funcs, which is supposed to handle the vma setup. It will be used by both normal fops->mmap (via drm_gem_mmap_obj()) and prime mmap (via drm_gem_prime_mmap()).
For starters the shmem and vram helpers are switched over to the new workflow, to show things in action for review.
v4:
- pick up a reviewed-by missed.
- add changelogs to patch commit msgs.
- make ttm_bo_mmap_vma_setup static.
Gerd Hoffmann (11):
drm: add mmap() to drm_gem_object_funcs
drm/shmem: switch shmem helper to &drm_gem_object_funcs.mmap drm/shmem: drop VM_DONTDUMP
drm/shmem: drop VM_IO
drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS
drm/ttm: factor out ttm_bo_mmap_vma_setup
drm/ttm: rename ttm_fbdev_mmap
drm/ttm: add drm_gem_ttm_mmap()
drm/vram: switch vram helper to &drm_gem_object_funcs.mmap() drm/vram: drop verify_access
drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS
include/drm/drm_gem.h | 14 +++++ include/drm/drm_gem_shmem_helper.h | 30 +--------- include/drm/drm_gem_ttm_helper.h | 2 + include/drm/drm_gem_vram_helper.h | 25 --------- include/drm/ttm/ttm_bo_api.h | 10 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- drivers/gpu/drm/ast/ast_drv.c | 5 +- drivers/gpu/drm/bochs/bochs_drv.c | 5 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_gem.c | 27 ++++++--- drivers/gpu/drm/drm_gem_shmem_helper.c | 28 ++++------ drivers/gpu/drm/drm_gem_ttm_helper.c | 17 ++++++ drivers/gpu/drm/drm_gem_vram_helper.c | 56 +------------------ drivers/gpu/drm/drm_prime.c | 9 +++ .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/tiny/gm12u320.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 54 +++++++++--------- drivers/gpu/drm/v3d/v3d_bo.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- 25 files changed, 119 insertions(+), 199 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v4 1/11 drm: add mmap() to drm_gem_object_funcs
drm_gem_object_funcs->vm_ops alone can't handle everything which needs to be done for mmap(), tweaking vm_flags for example. So add a new mmap() callback to drm_gem_object_funcs where this code can go to.
Note that the vm_ops field is not used in case the mmap callback is present, it is expected that the callback sets vma->vm_ops instead.
Also setting vm_flags and vm_page_prot is the job of the new callback. so drivers have more control over these flags.
drm_gem_mmap_obj() will use the new callback for object specific mmap setup. With this in place the need for driver-speific fops->mmap callbacks goes away, drm_gem_mmap can be hooked instead.
drm_gem_prime_mmap() will use the new callback too to just mmap gem objects directly instead of jumping though loops to make drm_gem_object_lookup() and fops->mmap work.
--- include/drm/drm_gem.h | 14 ++++++++++++++ drivers/gpu/drm/drm_gem.c | 27 ++++++++++++++++++--------- drivers/gpu/drm/drm_prime.c | 9 +++++++++ 3 files changed, 41 insertions(+), 9 deletions(-)
include/drm/drm_gem.h +14 -0
@@ -150,6 +150,20 @@ struct drm_gem_object_funcs {*/ void (*vunmap)(struct drm_gem_object *obj,void *vaddr); +/** +* @mmap: +* +* Handle mmap() of the gem object, setup vma accordingly. +* +* This callback is optional. +* +* The callback is used by by both drm_gem_mmap_obj() and +* drm_gem_prime_mmap(). When @mmap is present @vm_ops is not +* used, the @mmap callback must set vma->vm_ops instead. +* +*/ +int (*mmap)(struct drm_gem_object *obj,struct vm_area_struct *vma); +/** * @vm_ops: *
drivers/gpu/drm/drm_gem.c +18 -9
@@ -1099,22 +1099,31 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, struct vm_area_struct *vma) {struct drm_device *dev = obj->dev; +int ret;/* Check for valid size. */ if (obj_size < vma->vm_end - vma->vm_start)return -EINVAL ; -if (obj->funcs && obj->funcs->vm_ops) - vma->vm_ops = obj->funcs->vm_ops; -else if (dev->driver->gem_vm_ops) - vma->vm_ops = dev->driver->gem_vm_ops; -else -return -EINVAL ; +if (obj->funcs && obj->funcs->mmap) { + ret = obj->funcs->mmap (obj, vma); +if (ret) +return ret; +WARN_ON (!(vma->vm_flags &VM_DONTEXPAND )); + }else { +if (obj->funcs && obj->funcs->vm_ops) + vma->vm_ops = obj->funcs->vm_ops; +else if (dev->driver->gem_vm_ops) + vma->vm_ops = dev->driver->gem_vm_ops; +else +return -EINVAL ; + + vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); + } - vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_private_data = obj; - vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); - vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot);/* Take a ref for this mapping of the object, so that the fault * handler can dereference the mmap offset's pointer to the object.
drivers/gpu/drm/drm_prime.c +9 -0
@@ -713,6 +713,15 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)struct file *fil;int ret; +if (obj->funcs && obj->funcs->mmap) { + ret = obj->funcs->mmap (obj, vma); +if (ret) +return ret; + vma->vm_private_data = obj; +drm_gem_object_get (obj); +return 0 ; + } + priv =kzalloc (sizeof (*priv),GFP_KERNEL ); fil =kzalloc (sizeof (*fil),GFP_KERNEL );if (!priv || !fil) {
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 2/11 drm/shmem: switch shmem helper to &drm_gem_object_funcs.mmap
In reply to Gerd HoffmannSwitch gem shmem helper to the new mmap() workflow, from &gem_driver.fops.mmap to &drm_gem_object_funcs.mmap.
v2: Fix vm_flags and vm_page_prot handling.
--- include/drm/drm_gem_shmem_helper.h | 6 ++---- drivers/gpu/drm/drm_gem_shmem_helper.c | 28 +++++++++---------------- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/v3d/v3d_bo.c | 2 +- drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- 5 files changed, 15 insertions(+), 25 deletions(-)
include/drm/drm_gem_shmem_helper.h +2 -4
@@ -111,7 +111,7 @@ struct drm_gem_shmem_object { .poll = drm_poll,\ .read = drm_read,\ .llseek = noop_llseek,\ - .mmap = drm_gem_shmem_mmap, \ + .mmap = drm_gem_mmap, \ }struct drm_gem_shmem_object *drm_gem_shmem_create (struct drm_device *dev,size_t size);
@@ -143,9 +143,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,int drm_gem_shmem_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int drm_gem_shmem_mmap (struct file *filp,struct vm_area_struct *vma); - -extern const struct vm_operations_struct drm_gem_shmem_vm_ops; +int drm_gem_shmem_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);void drm_gem_shmem_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *obj);
drivers/gpu/drm/drm_gem_shmem_helper.c +10 -18
@@ -32,7 +32,7 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, - .vm_ops = &drm_gem_shmem_vm_ops, + .mmap = drm_gem_shmem_mmap, };/**
@@ -505,39 +505,30 @@ static void drm_gem_shmem_vm_close(struct vm_area_struct *vma)drm_gem_vm_close (vma); } -const struct vm_operations_struct drm_gem_shmem_vm_ops = { +static const struct vm_operations_struct drm_gem_shmem_vm_ops = { .fault = drm_gem_shmem_fault, .open = drm_gem_shmem_vm_open, .close = drm_gem_shmem_vm_close, }; -EXPORT_SYMBOL_GPL (drm_gem_shmem_vm_ops);/** * drm_gem_shmem_mmap - Memory-map a shmem GEM object -* @filp: File object +* @obj: gem object * @vma: VMA for the area to be mapped * * This function implements an augmented version of the GEM DRM file mmap * operation for shmem objects. Drivers which employ the shmem helpers should -* use this function as their &file_operations.mmap handler in the DRM device file's -* file_operations structure. -* -* Instead of directly referencing this function, drivers should use the -* DEFINE_DRM_GEM_SHMEM_FOPS() macro. +* use this function as their &drm_gem_object_funcs.mmap handler. * * Returns: * 0 on success or a negative error code on failure. */ -int drm_gem_shmem_mmap (struct file *filp,struct vm_area_struct *vma) +int drm_gem_shmem_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) {struct drm_gem_shmem_object *shmem;int ret; - ret =drm_gem_mmap (filp, vma); -if (ret) -return ret; - - shmem =to_drm_gem_shmem_obj (vma->vm_private_data); + shmem =to_drm_gem_shmem_obj (obj); ret =drm_gem_shmem_get_pages (shmem);if (ret) {
@@ -545,9 +536,10 @@ int drm_gem_shmem_mmap(struct file *filp, struct vm_area_struct *vma)return ret; } -/* VM_PFNMAP was set by drm_gem_mmap() */ - vma->vm_flags &= ~VM_PFNMAP ; - vma->vm_flags |=VM_MIXEDMAP ; + vma->vm_flags |=VM_IO |VM_MIXEDMAP |VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); + vma->vm_ops = &drm_gem_shmem_vm_ops;/* Remove the fake offset */ vma->vm_pgoff -=drm_vma_node_start (&shmem->base.vma_node);
drivers/gpu/drm/panfrost/panfrost_gem.c +1 -1
@@ -112,7 +112,7 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, - .vm_ops = &drm_gem_shmem_vm_ops, + .mmap = drm_gem_shmem_mmap, };/**
drivers/gpu/drm/v3d/v3d_bo.c +1 -1
@@ -58,7 +58,7 @@ static const struct drm_gem_object_funcs v3d_gem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, - .vm_ops = &drm_gem_shmem_vm_ops, + .mmap = drm_gem_shmem_mmap, };/* gem_create_object function for allocating a BO struct and doing
drivers/gpu/drm/virtio/virtgpu_object.c +1 -1
@@ -86,7 +86,7 @@ static const struct drm_gem_object_funcs virtio_gpu_gem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, - .vm_ops = &drm_gem_shmem_vm_ops, + .mmap = &drm_gem_shmem_mmap, }; struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 3/11 drm/shmem: drop VM_DONTDUMP
In reply to Gerd HoffmannNot obvious why this is needed. According to Deniel Vetter this is most likely a historic artefact dating back to the days where drm drivers exposed hardware registers as mmap'able gem objects, to avoid dumping touching those registers. shmem gem objects surely don't need that ...
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +1 -1
@@ -536,7 +536,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)return ret; } - vma->vm_flags |=VM_IO |VM_MIXEDMAP |VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_flags |=VM_IO |VM_MIXEDMAP |VM_DONTEXPAND ; vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); vma->vm_ops = &drm_gem_shmem_vm_ops;
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v4 4/11 drm/shmem: drop VM_IO
In reply to Gerd HoffmannVM_IO is wrong here, shmem uses normal ram not io memory.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +1 -1
@@ -536,7 +536,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)return ret; } - vma->vm_flags |=VM_IO |VM_MIXEDMAP |VM_DONTEXPAND ; + vma->vm_flags |=VM_MIXEDMAP |VM_DONTEXPAND ; vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); vma->vm_ops = &drm_gem_shmem_vm_ops;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 5/11 drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS
In reply to Gerd HoffmannDEFINE_DRM_GEM_SHMEM_FOPS is identical
to DEFINE_DRM_GEM_FOPS now, drop it.
--- include/drm/drm_gem_shmem_helper.h | 26 ------------------------- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/tiny/gm12u320.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- 6 files changed, 5 insertions(+), 31 deletions(-)
include/drm/drm_gem_shmem_helper.h +0 -26
@@ -88,32 +88,6 @@ struct drm_gem_shmem_object {#define to_drm_gem_shmem_obj (obj) \ container_of(obj, struct drm_gem_shmem_object, base) -/** -* DEFINE_DRM_GEM_SHMEM_FOPS() - Macro to generate file operations for shmem drivers -* @name: name for the generated structure -* -* This macro autogenerates a suitable &struct file_operations for shmem based -* drivers, which can be assigned to &drm_driver.fops. Note that this structure -* cannot be shared between drivers, because it contains a reference to the -* current module using THIS_MODULE. -* -* Note that the declaration is already marked as static - if you need a -* non-static version of this you're probably doing it wrong and will break the -* THIS_MODULE reference by accident. -*/ -#define DEFINE_DRM_GEM_SHMEM_FOPS (name) \ - static const struct file_operations name = {\ - .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap, \ - } -struct drm_gem_shmem_object *drm_gem_shmem_create (struct drm_device *dev,size_t size);void drm_gem_shmem_free_object (struct drm_gem_object *obj);
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -510,7 +510,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)/* ------------------------------------------------------------------ */ -DEFINE_DRM_GEM_SHMEM_FOPS (cirrus_fops); +DEFINE_DRM_GEM_FOPS (cirrus_fops);static struct drm_driver cirrus_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC ,
drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1
@@ -470,7 +470,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { PANFROST_IOCTL(MADVISE, madvise, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_SHMEM_FOPS (panfrost_drm_driver_fops); +DEFINE_DRM_GEM_FOPS (panfrost_drm_driver_fops);/* * Panfrost driver version:
drivers/gpu/drm/tiny/gm12u320.c +1 -1
@@ -649,7 +649,7 @@ static void gm12u320_driver_release(struct drm_device *dev)kfree (gm12u320); } -DEFINE_DRM_GEM_SHMEM_FOPS (gm12u320_fops); +DEFINE_DRM_GEM_FOPS (gm12u320_fops);static struct drm_driver gm12u320_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC ,
drivers/gpu/drm/v3d/v3d_drv.c +1 -1
@@ -172,7 +172,7 @@ v3d_postclose(struct drm_device *dev, struct drm_file *file)kfree (v3d_priv); } -DEFINE_DRM_GEM_SHMEM_FOPS (v3d_drm_fops); +DEFINE_DRM_GEM_FOPS (v3d_drm_fops);/* DRM_AUTH is required on SUBMIT_CL for now, while we don't have GMP * protection between clients. Note that render nodes would be be
drivers/gpu/drm/virtio/virtgpu_drv.c +1 -1
@@ -184,7 +184,7 @@ MODULE_AUTHOR("Dave Airlie <[email protected]>");MODULE_AUTHOR ("Gerd Hoffmann <[email protected]>" );MODULE_AUTHOR ("Alon Levy" ); -DEFINE_DRM_GEM_SHMEM_FOPS (virtio_gpu_driver_fops); +DEFINE_DRM_GEM_FOPS (virtio_gpu_driver_fops);static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_RENDER |DRIVER_ATOMIC ,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 6/11 drm/ttm: factor out ttm_bo_mmap_vma_setup
In reply to Gerd HoffmannFactor out ttm vma setup to a new function.
Reduces code duplication a bit.
v2: don't change vm_flags (moved to separate patch).
v4: make ttm_bo_mmap_vma_setup static.
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 46 +++++++++++++++++---------------- 1 file changed, 24 insertions(+), 22 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_vm.c +24 -22
@@ -426,6 +426,28 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,return bo; } +static void ttm_bo_mmap_vma_setup (struct ttm_buffer_object *bo,struct vm_area_struct *vma) +{ + vma->vm_ops = &ttm_bo_vm_ops; + +/* +* Note: We're transferring the bo reference to +* vma->vm_private_data here. +*/ + + vma->vm_private_data = bo; + +/* +* We'd like to use VM_PFNMAP on shared mappings, where +* (vma->vm_flags & VM_SHARED) != 0, for performance reasons, +* but for some reason VM_PFNMAP + x86 PAT + write-combine is very +* bad for performance. Until that has been sorted out, use +* VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719 +*/ + vma->vm_flags |=VM_MIXEDMAP ; + vma->vm_flags |=VM_IO |VM_DONTEXPAND |VM_DONTDUMP ; +} +int ttm_bo_mmap (struct file *filp,struct vm_area_struct *vma,struct ttm_bo_device *bdev) {
@@ -449,24 +471,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,if (unlikely (ret !=0 )) goto out_unref; - vma->vm_ops = &ttm_bo_vm_ops; - -/* -* Note: We're transferring the bo reference to -* vma->vm_private_data here. -*/ - - vma->vm_private_data = bo; - -/* -* We'd like to use VM_PFNMAP on shared mappings, where -* (vma->vm_flags & VM_SHARED) != 0, for performance reasons, -* but for some reason VM_PFNMAP + x86 PAT + write-combine is very -* bad for performance. Until that has been sorted out, use -* VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719 -*/ - vma->vm_flags |=VM_MIXEDMAP ; - vma->vm_flags |=VM_IO |VM_DONTEXPAND |VM_DONTDUMP ; +ttm_bo_mmap_vma_setup (bo, vma);return 0 ; out_unref:ttm_bo_put (bo);
@@ -481,10 +486,7 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)ttm_bo_get (bo); - vma->vm_ops = &ttm_bo_vm_ops; - vma->vm_private_data = bo; - vma->vm_flags |=VM_MIXEDMAP ; - vma->vm_flags |=VM_IO |VM_DONTEXPAND ; +ttm_bo_mmap_vma_setup (bo, vma);return 0 ; }EXPORT_SYMBOL (ttm_fbdev_mmap);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup
Am 16.10.19 um 13:51 schrieb Gerd Hoffmann:
Quoted 7 lines
Factor out ttm vma setup to a new function.
Reduces code duplication a bit.v2: don't change
vm_flags(moved to separate patch).
v4: makettm_bo_mmap_vma_setupstatic.Signed-off-by Gerd Hoffmann <[email protected]>
#7 in the series.
Quoted 75 lines
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 46 +++++++++++++++++---------------- 1 file changed, 24 insertions(+), 22 deletions(-)drivers/gpu/drm/ttm/ttm_bo_vm.c +24
-22@@ -426,6 +426,28 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,return bo; } +static void ttm_bo_mmap_vma_setup (struct ttm_buffer_object *bo,struct vm_area_struct *vma) +{ + vma->vm_ops = &ttm_bo_vm_ops; + +/* +* Note: We're transferring the bo reference to +* vma->vm_private_data here. +*/ + + vma->vm_private_data = bo; + +/* +* We'd like to use VM_PFNMAP on shared mappings, where +* (vma->vm_flags & VM_SHARED) != 0, for performance reasons, +* but for some reason VM_PFNMAP + x86 PAT + write-combine is very +* bad for performance. Until that has been sorted out, use +* VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719 +*/ + vma->vm_flags |=VM_MIXEDMAP ; + vma->vm_flags |=VM_IO |VM_DONTEXPAND |VM_DONTDUMP ; +} +int ttm_bo_mmap (struct file *filp,struct vm_area_struct *vma,struct ttm_bo_device *bdev) {@@ -449,24 +471,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,if (unlikely (ret !=0 )) goto out_unref; - vma->vm_ops = &ttm_bo_vm_ops; - -/* -* Note: We're transferring the bo reference to -* vma->vm_private_data here. -*/ - - vma->vm_private_data = bo; - -/* -* We'd like to use VM_PFNMAP on shared mappings, where -* (vma->vm_flags & VM_SHARED) != 0, for performance reasons, -* but for some reason VM_PFNMAP + x86 PAT + write-combine is very -* bad for performance. Until that has been sorted out, use -* VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719 -*/ - vma->vm_flags |=VM_MIXEDMAP ; - vma->vm_flags |=VM_IO |VM_DONTEXPAND |VM_DONTDUMP ; +ttm_bo_mmap_vma_setup (bo, vma);return 0 ; out_unref:ttm_bo_put (bo);@@ -481,10 +486,7 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)ttm_bo_get (bo); - vma->vm_ops = &ttm_bo_vm_ops; - vma->vm_private_data = bo; - vma->vm_flags |=VM_MIXEDMAP ; - vma->vm_flags |=VM_IO |VM_DONTEXPAND ; +ttm_bo_mmap_vma_setup (bo, vma);return 0 ; }EXPORT_SYMBOL (ttm_fbdev_mmap);
Koenig, Christian
maintainerRe: [PATCH v4 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup
Am 16.10.19 um 14:18 schrieb Christian König:
Quoted 11 lines
Am 16.10.19 um 13:51 schrieb Gerd Hoffmann:
Quoted 7 lines
Factor out ttm vma setup to a new function.
Reduces code duplication a bit.v2: don't change
vm_flags(moved to separate patch).
v4: makettm_bo_mmap_vma_setupstatic.Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Christian König <[email protected]> for this oneand #7 in the series.
Any objections that I add these two to my drm-ttm-next pull request or did you wanted to merge that through some other tree?
Thanks,
Christian.
Quoted 78 lines
Quoted 77 lines
---
drivers/gpu/drm/ttm/ttm_bo_vm.c| 46 +++++++++++++++++----------------1 file changed, 24 insertions(+), 22 deletions(-)drivers/gpu/drm/ttm/ttm_bo_vm.c +21
-0@@ -426,6 +426,28 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev, return bo; } +static void ttm_bo_mmap_vma_setup(struct ttm_buffer_object *bo, struct vm_area_struct *vma) +{ + vma->vm_ops = &ttm_bo_vm_ops; + + /* + * Note: We're transferring the bo reference to + * vma->vm_private_data here. + */ + + vma->vm_private_data = bo; + + /* + * We'd like to use VM_PFNMAP on shared mappings, where + * (vma->vm_flags & VM_SHARED) != 0, for performance reasons, + * but for some reason VM_PFNMAP + x86 PAT + write-combine is very + * bad for performance. Until that has been sorted out, use + * VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719 + */ + vma->vm_flags |= VM_MIXEDMAP; + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; +} + int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,struct
ttm_bo_device*bdev)
{drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-17@@ -449,24 +471,7 @@ int ttm_bo_mmap(struct file *filp, structvm_area_struct *vma, if (unlikely(ret != 0)) goto out_unref; - vma->vm_ops = &ttm_bo_vm_ops; - - /* - * Note: We're transferring the bo reference to - * vma->vm_private_data here. - */ - - vma->vm_private_data = bo; - - /* - * We'd like to use VM_PFNMAP on shared mappings, where - * (vma->vm_flags & VM_SHARED) != 0, for performance reasons, - * but for some reason VM_PFNMAP + x86 PAT + write-combine is very - * bad for performance. Until that has been sorted out, use - * VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719 - */ - vma->vm_flags |= VM_MIXEDMAP; - vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + ttm_bo_mmap_vma_setup(bo, vma); return 0;
out_unref:
ttm_bo_put(bo);drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-3@@ -481,10 +486,7 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo) ttm_bo_get(bo); - vma->vm_ops = &ttm_bo_vm_ops; - vma->vm_private_data = bo; - vma->vm_flags |= VM_MIXEDMAP; - vma->vm_flags |= VM_IO | VM_DONTEXPAND; + ttm_bo_mmap_vma_setup(bo, vma); return 0; } EXPORT_SYMBOL(ttm_fbdev_mmap);
Gerd Hoffmann
maintainerRe: [PATCH v4 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup
Quoted 8 lines · Christian
Am 16.10.19 um 14:18 schrieb Christian König:
Quoted 7 lines
Am 16.10.19 um 13:51 schrieb Gerd Hoffmann:
Quoted 6 lines
Factor out ttm vma setup to a new function.
Reduces code duplication a bit.v2: don't change
vm_flags(moved to separate patch).
v4: makettm_bo_mmap_vma_setupstatic.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Christian König <[email protected]> for this oneand #7 in the series.
Any objections that I add these two to my drm-ttm-next pull request or did you wanted to merge that through some other tree?
Pushed series to drm-misc-next a few minutes ago (before I saw your mail).
cheers,
Gerd
Koenig, Christian
maintainerRe: [PATCH v4 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup
Am 17.10.19 um 14:30 schrieb Gerd Hoffmann:
Quoted 9 lines · Christian
Quoted 8 lines
Am 16.10.19 um 14:18 schrieb Christian König:
Quoted 7 lines
Am 16.10.19 um 13:51 schrieb Gerd Hoffmann:
Quoted 6 lines
Factor out ttm vma setup to a new function.
Reduces code duplication a bit.v2: don't change
vm_flags(moved to separate patch).
v4: makettm_bo_mmap_vma_setupstatic.
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Christian König <[email protected]> for this oneand #7 in the series.
Any objections that I add these two to my drm-ttm-next pull request or did you wanted to merge that through some other tree?
Pushed series to drm-misc-next a few minutes ago (before I saw your mail).
No, problem. That works for me as well.
Quoted 4 lines
cheers,
Gerd
Gerd Hoffmann
maintainerPATCH v4 7/11 drm/ttm: rename ttm_fbdev_mmap
In reply to Gerd HoffmannRename ttm_fbdev_mmap to ttm_bo_mmap_obj. Move the vm_pgoff sanity check to amdgpu_bo_fbdev_mmap (only ttm_fbdev_mmap user in tree).
The ttm_bo_mmap_obj function can now be used to map any buffer object. This allows to implement &drm_gem_object_funcs.mmap in gem ttm helpers.
v3: patch added to series
--- include/drm/ttm/ttm_bo_api.h | 10 ++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 ++++- drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 ++------ 3 files changed, 10 insertions(+), 13 deletions(-)
include/drm/ttm/ttm_bo_api.h +4 -6
@@ -710,16 +710,14 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page,void ttm_bo_kunmap (struct ttm_bo_kmap_obj *map);/** -* ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. +* ttm_bo_mmap_obj - mmap memory backed by a ttm buffer object. * * @vma: vma as input from the fbdev mmap method. -* @bo: The bo backing the address space. The address space will -* have the same size as the bo, and start at offset 0. +* @bo: The bo backing the address space. * -* This function is intended to be called by the fbdev mmap method -* if the fbdev address space is to be backed by a bo. +* Maps a buffer object. */ -int ttm_fbdev_mmap (struct vm_area_struct *vma,struct ttm_buffer_object *bo); +int ttm_bo_mmap_obj (struct vm_area_struct *vma,struct ttm_buffer_object *bo);/** * ttm_bo_mmap - mmap out of the ttm device address space.
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +4 -1
@@ -1058,7 +1058,10 @@ void amdgpu_bo_fini(struct amdgpu_device *adev)int amdgpu_bo_fbdev_mmap (struct amdgpu_bo *bo,struct vm_area_struct *vma) { -return ttm_fbdev_mmap (vma, &bo->tbo); +if (vma->vm_pgoff !=0 ) +return -EACCES ; + +return ttm_bo_mmap_obj (vma, &bo->tbo); }/**
drivers/gpu/drm/ttm/ttm_bo_vm.c +2 -6
@@ -479,14 +479,10 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma, }EXPORT_SYMBOL (ttm_bo_mmap); -int ttm_fbdev_mmap (struct vm_area_struct *vma,struct ttm_buffer_object *bo) +int ttm_bo_mmap_obj (struct vm_area_struct *vma,struct ttm_buffer_object *bo) { -if (vma->vm_pgoff !=0 ) -return -EACCES ; -ttm_bo_get (bo); -ttm_bo_mmap_vma_setup (bo, vma);return 0 ; } -EXPORT_SYMBOL (ttm_fbdev_mmap); +EXPORT_SYMBOL (ttm_bo_mmap_obj);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v4 8/11 drm/ttm: add drm_gem_ttm_mmap()
In reply to Gerd HoffmannAdd helper function to mmap ttm bo's using &drm_gem_object_funcs.mmap().
Note that with this code path access verification is done by drm_gem_mmap() (which calls drm_vma_node_is_allowed(()). The &ttm_bo_driver.verify_access() callback is is not used.
v3: use ttm_bo_mmap_obj instead of ttm_bo_mmap_vma_setup
--- include/drm/drm_gem_ttm_helper.h | 2 ++ drivers/gpu/drm/drm_gem_ttm_helper.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+)
include/drm/drm_gem_ttm_helper.h +2 -0
@@ -15,5 +15,7 @@void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *gem); +int drm_gem_ttm_mmap (struct drm_gem_object *gem, +struct vm_area_struct *vma);#endif
drivers/gpu/drm/drm_gem_ttm_helper.c +17 -0
@@ -52,5 +52,22 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, }EXPORT_SYMBOL (drm_gem_ttm_print_info); +/** +* drm_gem_ttm_mmap() - mmap &ttm_buffer_object +* @gem: GEM object. +* @vma: vm area. +* +* This function can be used as &drm_gem_object_funcs.mmap +* callback. +*/ +int drm_gem_ttm_mmap (struct drm_gem_object *gem, +struct vm_area_struct *vma) +{ +struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem); + +return ttm_bo_mmap_obj (vma, bo); +} +EXPORT_SYMBOL (drm_gem_ttm_mmap); +MODULE_DESCRIPTION ("DRM gem ttm helpers" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.18.1
Re: [PATCH v4 08/11] drm/ttm: add drm_gem_ttm_mmap()
Quoted 9 lines · Gerd Hoffmann
Add helper function to mmap ttm bo's using
&drm_gem_object_funcs.mmap().Note that with this code path access verification is done by
drm_gem_mmap()(which calls drm_vma_node_is_allowed(()). The&ttm_bo_driver.verify_access()callback is is not used.v3: use
ttm_bo_mmap_objinstead ofttm_bo_mmap_vma_setupSigned-off-by Gerd Hoffmann <[email protected]>
Also on the entire series:
Quoted 47 lines
--- include/drm/drm_gem_ttm_helper.h | 2 ++ drivers/gpu/drm/drm_gem_ttm_helper.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+)include/drm/drm_gem_ttm_helper.h +2
-0@@ -15,5 +15,7 @@void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *gem); +int drm_gem_ttm_mmap (struct drm_gem_object *gem, +struct vm_area_struct *vma);#endif drivers/gpu/drm/drm_gem_ttm_helper.c +17
-0@@ -52,5 +52,22 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, }EXPORT_SYMBOL (drm_gem_ttm_print_info); +/** +* drm_gem_ttm_mmap() - mmap &ttm_buffer_object +* @gem: GEM object. +* @vma: vm area. +* +* This function can be used as &drm_gem_object_funcs.mmap +* callback. +*/ +int drm_gem_ttm_mmap (struct drm_gem_object *gem, +struct vm_area_struct *vma) +{ +struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem); + +return ttm_bo_mmap_obj (vma, bo); +} +EXPORT_SYMBOL (drm_gem_ttm_mmap); +MODULE_DESCRIPTION ("DRM gem ttm helpers" );MODULE_LICENSE ("GPL" );Signature · 1 line
2.18.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v4 9/11 drm/vram: switch vram helper to &drm_gem_object_funcs.mmap()
In reply to Gerd HoffmannWire up the new drm_gem_ttm_mmap() helper function, use generic drm_gem_mmap for &fops.mmap and delete dead drm_vram_mm_file_operations_mmap().
--- include/drm/drm_gem_vram_helper.h | 9 +------ drivers/gpu/drm/drm_gem_vram_helper.c | 34 +-------------------------- 2 files changed, 2 insertions(+), 41 deletions(-)
include/drm/drm_gem_vram_helper.h +1 -8
@@ -184,13 +184,6 @@ struct drm_vram_mm *drm_vram_helper_alloc_mm( struct drm_device *dev, uint64_t vram_base, size_t vram_size);void drm_vram_helper_release_mm (struct drm_device *dev); -/* -* Helpers for &struct file_operations -*/ - -int drm_vram_mm_file_operations_mmap ( -struct file *filp,struct vm_area_struct *vma); -/** * define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \ &struct file_operations
@@ -204,7 +197,7 @@ int drm_vram_mm_file_operations_mmap( .poll = drm_poll, \ .unlocked_ioctl = drm_ioctl, \ .compat_ioctl = drm_compat_ioctl, \ - .mmap = drm_vram_mm_file_operations_mmap, \ + .mmap = drm_gem_mmap, \ .open = drm_open, \ .release = drm_release \
drivers/gpu/drm/drm_gem_vram_helper.c +1 -33
@@ -737,6 +737,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { .unpin = drm_gem_vram_object_unpin, .vmap = drm_gem_vram_object_vmap, .vunmap = drm_gem_vram_object_vunmap, + .mmap = drm_gem_ttm_mmap, .print_info = drm_gem_ttm_print_info, };
@@ -971,12 +972,6 @@ static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)ttm_bo_device_release (&vmm->bdev); } -static int drm_vram_mm_mmap (struct file *filp,struct vm_area_struct *vma, -struct drm_vram_mm *vmm) -{ -return ttm_bo_mmap (filp, vma, &vmm->bdev); -} -/* * Helpers for integration with struct drm_device */
@@ -1032,30 +1027,3 @@ void drm_vram_helper_release_mm(struct drm_device *dev) dev->vram_mm =NULL ; }EXPORT_SYMBOL (drm_vram_helper_release_mm); - -/* -* Helpers for &struct file_operations -*/ - -/** -* drm_vram_mm_file_operations_mmap() - \ -Implements &struct file_operations.mmap() -* @filp: the mapping's file structure -* @vma: the mapping's memory area -* -* Returns: -* 0 on success, or -* a negative error code otherwise. -*/ -int drm_vram_mm_file_operations_mmap ( -struct file *filp,struct vm_area_struct *vma) -{ -struct drm_file *file_priv = filp->private_data; -struct drm_device *dev = file_priv->minor->dev; - -if (WARN_ONCE (!dev->vram_mm,"VRAM MM not initialized" )) -return -EINVAL ; - -return drm_vram_mm_mmap (filp, vma, dev->vram_mm); -} -EXPORT_SYMBOL (drm_vram_mm_file_operations_mmap);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 10/11 drm/vram: drop verify_access
In reply to Gerd HoffmannNot needed any more.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 22 ---------------------- 1 file changed, 22 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +0 -22
@@ -552,13 +552,6 @@ static void drm_gem_vram_bo_driver_evict_flags(struct drm_gem_vram_object *gbo, *pl = gbo->placement; } -static int drm_gem_vram_bo_driver_verify_access (struct drm_gem_vram_object *gbo, -struct file *filp) -{ -return drm_vma_node_verify_access (&gbo->bo.base.vma_node, - filp->private_data); -} -static void drm_gem_vram_bo_driver_move_notify (struct drm_gem_vram_object *gbo,bool evict,struct ttm_mem_reg *new_mem)
@@ -823,20 +816,6 @@ static void bo_driver_evict_flags(struct ttm_buffer_object *bo,drm_gem_vram_bo_driver_evict_flags (gbo, placement); } -static int bo_driver_verify_access (struct ttm_buffer_object *bo, -struct file *filp) -{ -struct drm_gem_vram_object *gbo; - -/* TTM may pass BOs that are not GEM VRAM BOs. */ -if (!drm_is_gem_vram (bo)) -return -EINVAL ; - - gbo =drm_gem_vram_of_bo (bo); - -return drm_gem_vram_bo_driver_verify_access (gbo, filp); -} -static void bo_driver_move_notify (struct ttm_buffer_object *bo,bool evict,struct ttm_mem_reg *new_mem)
@@ -893,7 +872,6 @@ static struct ttm_bo_driver bo_driver = { .init_mem_type = bo_driver_init_mem_type, .eviction_valuable = ttm_bo_eviction_valuable, .evict_flags = bo_driver_evict_flags, - .verify_access = bo_driver_verify_access, .move_notify = bo_driver_move_notify, .io_mem_reserve = bo_driver_io_mem_reserve, .io_mem_free = bo_driver_io_mem_free,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 11/11 drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS
In reply to Gerd HoffmannNot needed any more because we don't have vram specific fops any more. DEFINE_DRM_GEM_FOPS() can be used instead.
--- include/drm/drm_gem_vram_helper.h | 18 ------------------ drivers/gpu/drm/ast/ast_drv.c | 5 +---- drivers/gpu/drm/bochs/bochs_drv.c | 5 +---- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +---- drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +---- drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +---- 6 files changed, 5 insertions(+), 38 deletions(-)
include/drm/drm_gem_vram_helper.h +0 -18
@@ -184,22 +184,4 @@ struct drm_vram_mm *drm_vram_helper_alloc_mm( struct drm_device *dev, uint64_t vram_base, size_t vram_size);void drm_vram_helper_release_mm (struct drm_device *dev); -/** -* define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \ -&struct file_operations -* -* Drivers that use VRAM MM can use this macro to initialize -* &struct file_operations with default functions. -*/ -#define DRM_VRAM_MM_FILE_OPERATIONS \ - .llseek = no_llseek, \ - .read = drm_read, \ - .poll = drm_poll, \ - .unlocked_ioctl = drm_ioctl, \ - .compat_ioctl = drm_compat_ioctl, \ - .mmap = drm_gem_mmap, \ - .open = drm_open, \ - .release = drm_release \ - -#endif
drivers/gpu/drm/ast/ast_drv.c +1 -4
@@ -200,10 +200,7 @@ static struct pci_driver ast_pci_driver = { .driver.pm = &ast_pm_ops, }; -static const struct file_operations ast_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (ast_fops);static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM ,
drivers/gpu/drm/bochs/bochs_drv.c +1 -4
@@ -58,10 +58,7 @@ static int bochs_load(struct drm_device *dev)return ret; } -static const struct file_operations bochs_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (bochs_fops);static struct drm_driver bochs_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC ,
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -4
@@ -26,10 +26,7 @@#include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" -static const struct file_operations hibmc_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (hibmc_fops);static irqreturn_t hibmc_drm_interrupt (int irq,void *arg) {
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -4
@@ -58,10 +58,7 @@ static void mga_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } -static const struct file_operations mgag200_driver_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (mgag200_driver_fops);static struct drm_driver driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET ,
drivers/gpu/drm/vboxvideo/vbox_drv.c +1 -4
@@ -181,10 +181,7 @@ static struct pci_driver vbox_pci_driver = {#endif }; -static const struct file_operations vbox_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (vbox_fops);static struct drm_driver driver = { .driver_features =
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v4 11/11 drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS
In reply to Gerd HoffmannNot needed any more because we don't have vram specific fops any more. DEFINE_DRM_GEM_FOPS() can be used instead.
--- include/drm/drm_gem_vram_helper.h | 18 ------------------ drivers/gpu/drm/ast/ast_drv.c | 5 +---- drivers/gpu/drm/bochs/bochs_drv.c | 5 +---- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +---- drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +---- drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +---- 6 files changed, 5 insertions(+), 38 deletions(-)
include/drm/drm_gem_vram_helper.h +0 -18
@@ -184,22 +184,4 @@ struct drm_vram_mm *drm_vram_helper_alloc_mm( struct drm_device *dev, uint64_t vram_base, size_t vram_size);void drm_vram_helper_release_mm (struct drm_device *dev); -/** -* define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \ -&struct file_operations -* -* Drivers that use VRAM MM can use this macro to initialize -* &struct file_operations with default functions. -*/ -#define DRM_VRAM_MM_FILE_OPERATIONS \ - .llseek = no_llseek, \ - .read = drm_read, \ - .poll = drm_poll, \ - .unlocked_ioctl = drm_ioctl, \ - .compat_ioctl = drm_compat_ioctl, \ - .mmap = drm_gem_mmap, \ - .open = drm_open, \ - .release = drm_release \ - -#endif
drivers/gpu/drm/ast/ast_drv.c +1 -4
@@ -200,10 +200,7 @@ static struct pci_driver ast_pci_driver = { .driver.pm = &ast_pm_ops, }; -static const struct file_operations ast_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (ast_fops);static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM ,
drivers/gpu/drm/bochs/bochs_drv.c +1 -4
@@ -58,10 +58,7 @@ static int bochs_load(struct drm_device *dev)return ret; } -static const struct file_operations bochs_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (bochs_fops);static struct drm_driver bochs_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC ,
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -4
@@ -26,10 +26,7 @@#include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" -static const struct file_operations hibmc_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (hibmc_fops);static irqreturn_t hibmc_drm_interrupt (int irq,void *arg) {
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -4
@@ -58,10 +58,7 @@ static void mga_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } -static const struct file_operations mgag200_driver_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (mgag200_driver_fops);static struct drm_driver driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET ,
drivers/gpu/drm/vboxvideo/vbox_drv.c +1 -4
@@ -181,10 +181,7 @@ static struct pci_driver vbox_pci_driver = {#endif }; -static const struct file_operations vbox_fops = { - .owner =THIS_MODULE , -DRM_VRAM_MM_FILE_OPERATIONS -}; +DEFINE_DRM_GEM_FOPS (vbox_fops);static struct drm_driver driver = { .driver_features =
Signature · 1 line
2.18.1