Convert lima from GEM-SHMEM to GEM-UMA. The latter is just a copy, so this change it merely renaming symbols. No functional changes.
GEM-SHMEM will become more self-contained for drivers without specific memory management. GEM-UMA's interfaces will remain flexible for drivers with UMA hardware, such as lima. Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/lima/Kconfig | 4 ++-- drivers/gpu/drm/lima/lima_drv.c | 2 +- drivers/gpu/drm/lima/lima_gem.c | 30 +++++++++++++++--------------- drivers/gpu/drm/lima/lima_gem.h | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/lima/Kconfig b/drivers/gpu/drm/lima/Kconfig index fa1d4f5df31e..ad854acef58d 100644 --- a/drivers/gpu/drm/lima/Kconfig +++ b/drivers/gpu/drm/lima/Kconfig @@ -8,9 +8,9 @@ config DRM_LIMA depends on MMU depends on COMMON_CLK depends on OF + select DEVFREQ_GOV_SIMPLE_ONDEMAND + select DRM_GEM_UMA_HELPER select DRM_SCHED - select DRM_GEM_SHMEM_HELPER select PM_DEVFREQ - select DEVFREQ_GOV_SIMPLE_ONDEMAND help DRM driver for ARM Mali 400/450 GPUs. diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index 65210ab081bb..9d57d2e002f9 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -276,7 +276,7 @@ static const struct drm_driver lima_drm_driver = { .patchlevel = 0, .gem_create_object = lima_gem_create_object, - .gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, + .gem_prime_import_sg_table = drm_gem_uma_prime_import_sg_table, }; struct lima_block_reader { diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 9722b847a539..d6f00dde22ac 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -110,16 +110,16 @@ int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file, { int err; gfp_t mask; - struct drm_gem_shmem_object *shmem; + struct drm_gem_uma_object *uma; struct drm_gem_object *obj; struct lima_bo *bo; bool is_heap = flags & LIMA_BO_FLAG_HEAP; - shmem = drm_gem_shmem_create(dev, size); - if (IS_ERR(shmem)) - return PTR_ERR(shmem); + uma = drm_gem_uma_create(dev, size); + if (IS_ERR(uma)) + return PTR_ERR(uma); - obj = &shmem->base; + obj = &uma->base; /* Mali Utgard GPU can only support 32bit address space */ mask = mapping_gfp_mask(obj->filp->f_mapping); @@ -133,7 +133,7 @@ int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file, if (err) goto out; } else { - struct sg_table *sgt = drm_gem_shmem_get_pages_sgt(shmem); + struct sg_table *sgt = drm_gem_uma_get_pages_sgt(uma); if (IS_ERR(sgt)) { err = PTR_ERR(sgt); @@ -157,7 +157,7 @@ static void lima_gem_free_object(struct drm_gem_object *obj) if (!list_empty(&bo->va)) dev_err(obj->dev->dev, "lima gem free bo still has va\n"); - drm_gem_shmem_free(&bo->base); + drm_gem_uma_free(&bo->base); } static int lima_gem_object_open(struct drm_gem_object *obj, struct drm_file *file) @@ -185,7 +185,7 @@ static int lima_gem_pin(struct drm_gem_object *obj) if (bo->heap_size) return -EINVAL; - return drm_gem_shmem_pin_locked(&bo->base); + return drm_gem_uma_pin_locked(&bo->base); } static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) @@ -195,7 +195,7 @@ static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) if (bo->heap_size) return -EINVAL; - return drm_gem_shmem_vmap_locked(&bo->base, map); + return drm_gem_uma_vmap_locked(&bo->base, map); } static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) @@ -205,21 +205,21 @@ static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) if (bo->heap_size) return -EINVAL; - return drm_gem_shmem_mmap(&bo->base, vma); + return drm_gem_uma_mmap(&bo->base, vma); } static const struct drm_gem_object_funcs lima_gem_funcs = { .free = lima_gem_free_object, .open = lima_gem_object_open, .close = lima_gem_object_close, - .print_info = drm_gem_shmem_object_print_info, + .print_info = drm_gem_uma_object_print_info, .pin = lima_gem_pin, - .unpin = drm_gem_shmem_object_unpin, - .get_sg_table = drm_gem_shmem_object_get_sg_table, + .unpin = drm_gem_uma_object_unpin, + .get_sg_table = drm_gem_uma_object_get_sg_table, .vmap = lima_gem_vmap, - .vunmap = drm_gem_shmem_object_vunmap, + .vunmap = drm_gem_uma_object_vunmap, .mmap = lima_gem_mmap, - .vm_ops = &drm_gem_shmem_vm_ops, + .vm_ops = &drm_gem_uma_vm_ops, }; struct drm_gem_object *lima_gem_create_object(struct drm_device *dev, size_t size) diff --git a/drivers/gpu/drm/lima/lima_gem.h b/drivers/gpu/drm/lima/lima_gem.h index ccea06142f4b..6ad19fda3480 100644 --- a/drivers/gpu/drm/lima/lima_gem.h +++ b/drivers/gpu/drm/lima/lima_gem.h @@ -4,13 +4,13 @@ #ifndef __LIMA_GEM_H__ #define __LIMA_GEM_H__ -#include <drm/drm_gem_shmem_helper.h> +#include <drm/drm_gem_uma_helper.h> struct lima_submit; struct lima_vm; struct lima_bo { - struct drm_gem_shmem_object base; + struct drm_gem_uma_object base; struct mutex lock; struct list_head va; @@ -21,7 +21,7 @@ struct lima_bo { static inline struct lima_bo * to_lima_bo(struct drm_gem_object *obj) { - return container_of(to_drm_gem_shmem_obj(obj), struct lima_bo, base); + return container_of(to_drm_gem_uma_obj(obj), struct lima_bo, base); } static inline size_t lima_bo_size(struct lima_bo *bo) -- 2.52.0
