drm/lima: simplify driver by using more drm helpers
Subsystems (3)
Qiang Yu
maintainerv4 cover drm/lima: simplify driver by using more drm helpers
By using shared drm helpers:
1. drm_gem_(un)lock_reservations
2. drm_gem_shmem_helpers
we can simplify lima driver a lot and benifit from updates to these functions.
Patch series is based on drm-misc-next branch
v2:
Add drm_gem_objects_lookup_user and use it for driver which pass user GEM handles in contious array.
v3:
improve commit comment.
v4:
Drop drm_gem_objects_lookup refine patches.
Qiang Yu (3):
drm/lima: use drm_gem_shmem_helpers drm/lima: use drm_gem_(un)lock_reservations drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc
drivers/gpu/drm/lima/Kconfig | 1 + drivers/gpu/drm/lima/Makefile | 4 +- drivers/gpu/drm/lima/lima_device.c | 2 +- drivers/gpu/drm/lima/lima_drv.c | 22 +-- drivers/gpu/drm/lima/lima_gem.c | 195 ++++++++++---------------- drivers/gpu/drm/lima/lima_gem.h | 32 ++++- drivers/gpu/drm/lima/lima_gem_prime.c | 46 ------ drivers/gpu/drm/lima/lima_gem_prime.h | 13 -- drivers/gpu/drm/lima/lima_mmu.c | 1 - drivers/gpu/drm/lima/lima_object.c | 119 ---------------- drivers/gpu/drm/lima/lima_object.h | 35 ----- drivers/gpu/drm/lima/lima_sched.c | 6 +- drivers/gpu/drm/lima/lima_vm.c | 87 ++++++------ 13 files changed, 148 insertions(+), 415 deletions(-) delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h delete mode 100644 drivers/gpu/drm/lima/lima_object.c delete mode 100644 drivers/gpu/drm/lima/lima_object.h
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH v4 1/3 drm/lima: use drm_gem_shmem_helpers
Do not need to maintain our own shmem memory management code as drm_gem_shmem_helpers provides it. And we can also benifit from the work of others with shared code.
This is also a preparation for implementing buffer madv.
--- drivers/gpu/drm/lima/Kconfig | 1 + drivers/gpu/drm/lima/Makefile | 4 +- drivers/gpu/drm/lima/lima_drv.c | 22 +--- drivers/gpu/drm/lima/lima_gem.c | 141 +++++++++++++------------- drivers/gpu/drm/lima/lima_gem.h | 32 ++++-- drivers/gpu/drm/lima/lima_gem_prime.c | 46 --------- drivers/gpu/drm/lima/lima_gem_prime.h | 13 --- drivers/gpu/drm/lima/lima_mmu.c | 1 - drivers/gpu/drm/lima/lima_object.c | 119 ---------------------- drivers/gpu/drm/lima/lima_object.h | 35 ------- drivers/gpu/drm/lima/lima_sched.c | 6 +- drivers/gpu/drm/lima/lima_vm.c | 85 ++++++++-------- 12 files changed, 145 insertions(+), 360 deletions(-) delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h delete mode 100644 drivers/gpu/drm/lima/lima_object.c delete mode 100644 drivers/gpu/drm/lima/lima_object.h
drivers/gpu/drm/lima/Kconfig +1 -0
@@ -9,5 +9,6 @@ config DRM_LIMA depends on COMMON_CLK depends on OF select DRM_SCHED + select DRM_GEM_SHMEM_HELPER help DRM driver for ARM Mali 400/450 GPUs.
drivers/gpu/drm/lima/Makefile +1 -3
@@ -13,9 +13,7 @@ lima-y := \ lima_vm.o \ lima_sched.o \ lima_ctx.o \ - lima_gem_prime.o \ lima_dlbu.o \ - lima_bcast.o \ - lima_object.o + lima_bcast.o obj-$(CONFIG_DRM_LIMA) += lima.o
drivers/gpu/drm/lima/lima_drv.c +4 -18
@@ -12,7 +12,6 @@#include "lima_drv.h" #include "lima_gem.h" -#include "lima_gem_prime.h" #include "lima_vm.h" int lima_sched_timeout_ms;
@@ -240,16 +239,7 @@ static const struct drm_ioctl_desc lima_drm_driver_ioctls[] = {DRM_IOCTL_DEF_DRV (LIMA_CTX_FREE , lima_ioctl_ctx_free,DRM_RENDER_ALLOW ), }; -static const struct file_operations lima_drm_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = drm_compat_ioctl, -#endif - .mmap = lima_gem_mmap, -}; +DEFINE_DRM_GEM_SHMEM_FOPS (lima_drm_driver_fops);static struct drm_driver lima_drm_driver = { .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ,
@@ -258,10 +248,6 @@ static struct drm_driver lima_drm_driver = { .ioctls = lima_drm_driver_ioctls, .num_ioctls = ARRAY_SIZE(lima_drm_driver_ioctls), .fops = &lima_drm_driver_fops, - .gem_free_object_unlocked = lima_gem_free_object, - .gem_open_object = lima_gem_object_open, - .gem_close_object = lima_gem_object_close, - .gem_vm_ops = &lima_gem_vm_ops, .name = "lima", .desc = "lima DRM", .date = "20190217",
@@ -269,11 +255,11 @@ static struct drm_driver lima_drm_driver = { .minor = 0, .patchlevel = 0, + .gem_create_object = lima_gem_create_object, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import_sg_table = lima_gem_prime_import_sg_table, + .gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .gem_prime_get_sg_table = lima_gem_prime_get_sg_table, - .gem_prime_mmap = lima_gem_prime_mmap, + .gem_prime_mmap = drm_gem_prime_mmap, };static int lima_pdev_probe (struct platform_device *pdev)
drivers/gpu/drm/lima/lima_gem.c +70 -71
255 lines not on this page · raw message
drivers/gpu/drm/lima/lima_gem.h +25 -7
@@ -4,19 +4,37 @@#ifndef __LIMA_GEM_H__#define __LIMA_GEM_H__ -struct lima_bo ; +#include <drm/drm_gem_shmem_helper.h> +struct lima_submit ; -extern const struct vm_operations_struct lima_gem_vm_ops; +struct lima_bo { +struct drm_gem_shmem_object base; + +struct mutex lock; +struct list_head va; +}; + +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); +} + +static inline size_t lima_bo_size (struct lima_bo *bo) +{ +return bo->base.base.size; +} + +static inline struct dma_resv *lima_bo_resv (struct lima_bo *bo) +{ +return bo->base.base.resv; +} -struct lima_bo *lima_gem_create_bo (struct drm_device *dev,u32 size,u32 flags); +struct drm_gem_object *lima_gem_create_object (struct drm_device *dev,size_t size);int lima_gem_create_handle (struct drm_device *dev,struct drm_file *file,u32 size,u32 flags,u32 *handle); -void lima_gem_free_object (struct drm_gem_object *obj); -int lima_gem_object_open (struct drm_gem_object *obj,struct drm_file *file); -void lima_gem_object_close (struct drm_gem_object *obj,struct drm_file *file);int lima_gem_get_info (struct drm_file *file,u32 handle,u32 *va,u64 *offset); -int lima_gem_mmap (struct file *filp,struct vm_area_struct *vma);int lima_gem_submit (struct drm_file *file,struct lima_submit *submit);int lima_gem_wait (struct drm_file *file,u32 handle,u32 op,s64 timeout_ns);
drivers/gpu/drm/lima/lima_gem_prime.c deleted +0 -46
46 lines not on this page · raw message
drivers/gpu/drm/lima/lima_gem_prime.h deleted +0 -13
@@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */ -/* Copyright 2018-2019 Qiang Yu <[email protected]> */ - -#ifndef __LIMA_GEM_PRIME_H__ -#define __LIMA_GEM_PRIME_H__ - -struct drm_gem_object *lima_gem_prime_import_sg_table ( -struct drm_device *dev,struct dma_buf_attachment *attach, -struct sg_table *sgt); -struct sg_table *lima_gem_prime_get_sg_table (struct drm_gem_object *obj); -int lima_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma); - -#endif
drivers/gpu/drm/lima/lima_mmu.c +0 -1
@@ -8,7 +8,6 @@#include "lima_device.h" #include "lima_mmu.h" #include "lima_vm.h" -#include "lima_object.h" #include "lima_regs.h" #define mmu_write (reg, data) writel(data, ip->iomem + reg)
drivers/gpu/drm/lima/lima_object.c deleted +0 -119
119 lines not on this page · raw message
drivers/gpu/drm/lima/lima_object.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */ -/* Copyright 2018-2019 Qiang Yu <[email protected]> */ - -#ifndef __LIMA_OBJECT_H__ -#define __LIMA_OBJECT_H__ - -#include <drm/drm_gem.h> - -#include "lima_device.h" - -struct lima_bo { -struct drm_gem_object gem; - -struct page **pages; -dma_addr_t *pages_dma_addr; -struct sg_table *sgt; -void *vaddr; - -struct mutex lock; -struct list_head va; -}; - -static inline struct lima_bo * -to_lima_bo (struct drm_gem_object *obj) -{ - return container_of(obj, struct lima_bo, gem); -} - -struct lima_bo *lima_bo_create (struct lima_device *dev,u32 size, -u32 flags,struct sg_table *sgt); -void lima_bo_destroy (struct lima_bo *bo); -void *lima_bo_vmap (struct lima_bo *bo); -void lima_bo_vunmap (struct lima_bo *bo); - -#endif
drivers/gpu/drm/lima/lima_sched.c +3 -3
@@ -10,7 +10,7 @@#include "lima_vm.h" #include "lima_mmu.h" #include "lima_l2_cache.h" -#include "lima_object.h" +#include "lima_gem.h" struct lima_fence {struct dma_fence base;
@@ -117,7 +117,7 @@ int lima_sched_task_init(struct lima_sched_task *task,return -ENOMEM ;for (i =0 ; i < num_bos; i++) -drm_gem_object_get (&bos[i]->gem); +drm_gem_object_get (&bos[i]->base.base); err =drm_sched_job_init (&task->base, &context->base, vm);if (err) {
@@ -148,7 +148,7 @@ void lima_sched_task_fini(struct lima_sched_task *task)if (task->bos) {for (i =0 ; i < task->num_bos; i++) -drm_gem_object_put_unlocked (&task->bos[i]->gem); +drm_gem_object_put_unlocked (&task->bos[i]->base.base);kfree (task->bos); }
drivers/gpu/drm/lima/lima_vm.c +41 -44
140 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH v4 2/3 drm/lima: use drm_gem_(un)lock_reservations
In reply to Qiang YuSimplify the driver code with DRM GEM helper function.
v2:
improve commit comment.
--- drivers/gpu/drm/lima/lima_gem.c | 64 ++++----------------------------- 1 file changed, 6 insertions(+), 58 deletions(-)
drivers/gpu/drm/lima/lima_gem.c +6 -58
@@ -147,61 +147,6 @@ static int lima_gem_sync_bo(struct lima_sched_task *task, struct lima_bo *bo,return drm_gem_fence_array_add_implicit (&task->deps, &bo->base.base, write); } -static int lima_gem_lock_bos (struct lima_bo **bos,u32 nr_bos, -struct ww_acquire_ctx *ctx) -{ -int i, ret =0 , contended, slow_locked =-1 ; - -ww_acquire_init (ctx, &reservation_ww_class); - -retry: -for (i =0 ; i < nr_bos; i++) { -if (i == slow_locked) { - slow_locked =-1 ; -continue ; - } - - ret =ww_mutex_lock_interruptible (&lima_bo_resv (bos[i])->lock, ctx); -if (ret <0 ) { - contended = i; - goto err; - } - } - -ww_acquire_done (ctx); -return 0 ; - -err: -for (i--; i >=0 ; i--) -ww_mutex_unlock (&lima_bo_resv (bos[i])->lock); - -if (slow_locked >=0 ) -ww_mutex_unlock (&lima_bo_resv (bos[slow_locked])->lock); - -if (ret == -EDEADLK ) { -/* we lost out in a seqno race, lock and retry.. */ - ret =ww_mutex_lock_slow_interruptible ( - &lima_bo_resv (bos[contended])->lock, ctx); -if (!ret) { - slow_locked = contended; - goto retry; - } - } -ww_acquire_fini (ctx); - -return ret; -} - -static void lima_gem_unlock_bos (struct lima_bo **bos,u32 nr_bos, -struct ww_acquire_ctx *ctx) -{ -int i; - -for (i =0 ; i < nr_bos; i++) -ww_mutex_unlock (&lima_bo_resv (bos[i])->lock); -ww_acquire_fini (ctx); -} -static int lima_gem_add_deps (struct drm_file *file,struct lima_submit *submit) {int i, err;
@@ -267,7 +212,8 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit) bos[i] = bo; } - err =lima_gem_lock_bos (bos, submit->nr_bos, &ctx); + err =drm_gem_lock_reservations ((struct drm_gem_object **)bos, + submit->nr_bos, &ctx);if (err) goto err_out0;
@@ -300,7 +246,8 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit)dma_resv_add_shared_fence (lima_bo_resv (bos[i]), fence); } -lima_gem_unlock_bos (bos, submit->nr_bos, &ctx); +drm_gem_unlock_reservations ((struct drm_gem_object **)bos, + submit->nr_bos, &ctx);for (i =0 ; i < submit->nr_bos; i++)drm_gem_object_put_unlocked (&bos[i]->base.base);
@@ -317,7 +264,8 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit) err_out2:lima_sched_task_fini (submit->task); err_out1: -lima_gem_unlock_bos (bos, submit->nr_bos, &ctx); +drm_gem_unlock_reservations ((struct drm_gem_object **)bos, + submit->nr_bos, &ctx); err_out0:for (i =0 ; i < submit->nr_bos; i++) {if (!bos[i])
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH v4 3/3 drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc
In reply to Qiang YuThis prevent CMA printing dumy "PFNs busy" info which is caused by alloc fail re-try case.
--- drivers/gpu/drm/lima/lima_device.c | 2 +- drivers/gpu/drm/lima/lima_vm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/lima/lima_device.c +1 -1
@@ -314,7 +314,7 @@ int lima_device_init(struct lima_device *ldev) ldev->va_end =LIMA_VA_RESERVE_START ; ldev->dlbu_cpu =dma_alloc_wc ( ldev->dev,LIMA_PAGE_SIZE , - &ldev->dlbu_dma,GFP_KERNEL ); + &ldev->dlbu_dma,GFP_KERNEL | __GFP_NOWARN);if (!ldev->dlbu_cpu) { err = -ENOMEM ; goto err_out2;
drivers/gpu/drm/lima/lima_vm.c +2 -2
@@ -56,7 +56,7 @@ static int lima_vm_map_page(struct lima_vm *vm, dma_addr_t pa, u32 va) vm->bts[pbe].cpu =dma_alloc_wc ( vm->dev->dev,LIMA_PAGE_SIZE <<LIMA_VM_NUM_PT_PER_BT_SHIFT , - &vm->bts[pbe].dma,GFP_KERNEL | __GFP_ZERO); + &vm->bts[pbe].dma,GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);if (!vm->bts[pbe].cpu)return -ENOMEM ;
@@ -208,7 +208,7 @@ struct lima_vm *lima_vm_create(struct lima_device *dev)kref_init (&vm->refcount); vm->pd.cpu =dma_alloc_wc (dev->dev,LIMA_PAGE_SIZE , &vm->pd.dma, -GFP_KERNEL | __GFP_ZERO); +GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);if (!vm->pd.cpu) goto err_out0;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 16 lines · Qiang Yu
By using shared drm helpers:
1. drm_gem_(un)lock_reservations
2.drm_gem_shmem_helpers
we can simplify lima driver a lot and benifit from updates to these functions.Patch series is based on drm-misc-next branch
v2:
Adddrm_gem_objects_lookup_userand use it for driver which pass user GEM handles in contious array.v3:
improve commit comment.
Quoted 7 lines
v4:
Dropdrm_gem_objects_lookuprefine patches.Qiang Yu (3):
drm/lima: usedrm_gem_shmem_helpersdrm/lima: use drm_gem_(un)lock_reservations drm/lima: add__GFP_NOWARNflag to alldma_alloc_wc
LGTM, whole series:
Quoted 19 lines
drivers/gpu/drm/lima/Kconfig | 1 + drivers/gpu/drm/lima/Makefile | 4 +- drivers/gpu/drm/lima/lima_device.c | 2 +- drivers/gpu/drm/lima/lima_drv.c | 22 +-- drivers/gpu/drm/lima/lima_gem.c | 195 ++++++++++---------------- drivers/gpu/drm/lima/lima_gem.h | 32 ++++- drivers/gpu/drm/lima/lima_gem_prime.c | 46 ------ drivers/gpu/drm/lima/lima_gem_prime.h | 13 -- drivers/gpu/drm/lima/lima_mmu.c | 1 - drivers/gpu/drm/lima/lima_object.c | 119 ---------------- drivers/gpu/drm/lima/lima_object.h | 35 ----- drivers/gpu/drm/lima/lima_sched.c | 6 +- drivers/gpu/drm/lima/lima_vm.c | 87 ++++++------ 13 files changed, 148 insertions(+), 415 deletions(-) delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h delete mode 100644 drivers/gpu/drm/lima/lima_object.c delete mode 100644 drivers/gpu/drm/lima/lima_object.h
Quoted 7 lines
--
2.17.1_______________________________________________
lima mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/lima
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thanks, applied to drm-misc-next.
Regards,
Qiang
Quoted 21 lines · Vasily Khoruzhick
Quoted 19 lines · Qiang Yu
By using shared drm helpers:
1. drm_gem_(un)lock_reservations
2.drm_gem_shmem_helpers
we can simplify lima driver a lot and benifit from updates to these functions.Patch series is based on drm-misc-next branch
v2:
Adddrm_gem_objects_lookup_userand use it for driver which pass user GEM handles in contious array.v3:
improve commit comment.v4:
Dropdrm_gem_objects_lookuprefine patches.
Quoted 35 lines
Quoted 4 lines
Qiang Yu (3):
drm/lima: usedrm_gem_shmem_helpersdrm/lima: use drm_gem_(un)lock_reservations drm/lima: add__GFP_NOWARNflag to alldma_alloc_wcLGTM, whole series:
Reviewed-by Vasily Khoruzhick <[email protected]>Quoted 26 lines
drivers/gpu/drm/lima/Kconfig | 1 + drivers/gpu/drm/lima/Makefile | 4 +- drivers/gpu/drm/lima/lima_device.c | 2 +- drivers/gpu/drm/lima/lima_drv.c | 22 +-- drivers/gpu/drm/lima/lima_gem.c | 195 ++++++++++---------------- drivers/gpu/drm/lima/lima_gem.h | 32 ++++- drivers/gpu/drm/lima/lima_gem_prime.c | 46 ------ drivers/gpu/drm/lima/lima_gem_prime.h | 13 -- drivers/gpu/drm/lima/lima_mmu.c | 1 - drivers/gpu/drm/lima/lima_object.c | 119 ---------------- drivers/gpu/drm/lima/lima_object.h | 35 ----- drivers/gpu/drm/lima/lima_sched.c | 6 +- drivers/gpu/drm/lima/lima_vm.c | 87 ++++++------ 13 files changed, 148 insertions(+), 415 deletions(-) delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h delete mode 100644 drivers/gpu/drm/lima/lima_object.c delete mode 100644 drivers/gpu/drm/lima/lima_object.h--
2.17.1_______________________________________________
lima mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/lima
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel