drm/lima: simplify driver by using more drm helpers
Subsystems (5)
Qiang Yu
maintainercover drm/lima: simplify driver by using more drm helpers
By using shared drm helpers:
1. drm_gem_objects_lookup
2. drm_gem_(un)lock_reservations
3. drm_gem_shmem_helpers
we can simplify lima driver a lot and benifit from updates to these functions.
drm_gem_objects_lookup need a refine in order to be used by lima.
Note:
1. changes to panfrost and v3d are just compile tested.
2. patch series is based on drm-misc-next branch
Qiang Yu (6):
drm/gem: refine drm_gem_objects_lookup drm/v3d: use drm_gem_objects_lookup drm/lima: use drm_gem_objects_lookup 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/drm_gem.c | 28 +-- 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 | 27 +-- drivers/gpu/drm/lima/lima_gem.c | 254 ++++++++++-------------- 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 ++++---- drivers/gpu/drm/panfrost/panfrost_drv.c | 23 ++- drivers/gpu/drm/v3d/v3d_gem.c | 35 +--- include/drm/drm_gem.h | 2 +- 17 files changed, 222 insertions(+), 493 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 1/6 drm/gem: refine drm_gem_objects_lookup
Do not use user space bo handles directly and left the user to kernel copy work to drivers calling this function.
This is for driver like lima which does not pass gem bo handles continously in an array in ioctl argument.
--- drivers/gpu/drm/drm_gem.c | 28 +++++++------------------ drivers/gpu/drm/panfrost/panfrost_drv.c | 23 +++++++++++++++++--- include/drm/drm_gem.h | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-)
drivers/gpu/drm/drm_gem.c +8 -20
@@ -679,11 +679,11 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,/** * drm_gem_objects_lookup - look up GEM objects from an array of handles * @filp: DRM file private date -* @bo_handles: user pointer to array of userspace handle +* @bo_handles: array of GEM object handles * @count: size of handle array * @objs_out: returned pointer to array of drm_gem_object pointers * -* Takes an array of userspace handles and returns a newly allocated array of +* Takes an array of GEM object handles and returns a newly allocated array of * GEM objects. * * For a single handle lookup, use drm_gem_object_lookup().
@@ -695,11 +695,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,* failure. 0 is returned on success. * */ -int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out) {int ret; -u32 *handles;struct drm_gem_object **objs;if (!count)
@@ -710,23 +709,12 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,if (!objs)return -ENOMEM ; - handles =kvmalloc_array (count,sizeof (u32),GFP_KERNEL ); -if (!handles) { - ret = -ENOMEM ; - goto out; - } - -if (copy_from_user (handles, bo_handles, count *sizeof (u32))) { - ret = -EFAULT ; -DRM_DEBUG ("Failed to copy in GEM handles\n" ); - goto out; - } - - ret =objects_lookup (filp, handles, count, objs); - *objs_out = objs; + ret =objects_lookup (filp, bo_handles, count, objs); +if (ret) +kvfree (objs); +else + *objs_out = objs; -out: -kvfree (handles);return ret; }
drivers/gpu/drm/panfrost/panfrost_drv.c +20 -3
@@ -119,6 +119,9 @@ panfrost_lookup_bos(struct drm_device *dev,struct drm_panfrost_submit *args, struct panfrost_job *job) { + u32 *handles; +int ret; + job->bo_count = args->bo_handle_count;if (!job->bo_count)
@@ -130,9 +133,23 @@ panfrost_lookup_bos(struct drm_device *dev,if (!job->implicit_fences)return -ENOMEM ; -return drm_gem_objects_lookup (file_priv, - (void __user *)(uintptr_t )args->bo_handles, - job->bo_count, &job->bos); + handles =kvmalloc_array (job->bo_count,sizeof (u32),GFP_KERNEL ); +if (!handles) +return -ENOMEM ; + +if (copy_from_user (handles, (void __user *)(uintptr_t )args->bo_handles, + job->bo_count *sizeof (u32))) { +DRM_DEBUG ("Failed to copy in GEM handles\n" ); + ret = -EFAULT ; + goto out; + } + + ret =drm_gem_objects_lookup (file_priv, handles, + job->bo_count, &job->bos); + +out: +kvfree (handles); +return ret; }/**
include/drm/drm_gem.h +1 -1
@@ -387,7 +387,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj);void drm_gem_put_pages (struct drm_gem_object *obj,struct page **pages,bool dirty,bool accessed); -int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out);struct drm_gem_object *drm_gem_object_lookup (struct drm_file *filp,u32 handle); long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerRe: [PATCH 1/6] drm/gem: refine drm_gem_objects_lookup
Quoted 7 lines · Qiang Yu
Do not use user space bo handles directly and left the user to kernel copy work to drivers calling this function.
This is for driver like lima which does not pass gem bo handles continously in an array in ioctl argument.
Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Tomeu Vizoso <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Qiang Yu <[email protected]>--- drivers/gpu/drm/drm_gem.c | 28 +++++++------------------ drivers/gpu/drm/panfrost/panfrost_drv.c | 23 +++++++++++++++++---
Please keep the current variant. While only panfrost is converted ATM, vc4 and v3d will use this too.
Quoted 22 lines
include/drm/drm_gem.h | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_gem.c +2
-2@@ -679,11 +679,11 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,/** * drm_gem_objects_lookup - look up GEM objects from an array of handles * @filp: DRM file private date -* @bo_handles: user pointer to array of userspace handle +* @bo_handles: array of GEM object handles * @count: size of handle array * @objs_out: returned pointer to array of drm_gem_object pointers * -* Takes an array of userspace handles and returns a newly allocated array of +* Takes an array of GEM object handles and returns a newly allocated array of * GEM objects. * * For a single handle lookup, use drm_gem_object_lookup().
drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 699
Quoted 6 lines
drivers/gpu/drm/drm_gem.c +1
-1@@ -695,11 +695,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,* failure. 0 is returned on success. * */ -int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out)
Either split into drm_gem_objects_lookup() and a drm_gem_objects_lookup_user() with the latter calling the former or just make the helper take both a user and u32* ptr with the expectation that only one of them is non-NULL.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerRe: [PATCH 1/6] drm/gem: refine drm_gem_objects_lookup
Quoted 46 lines · Rob Herring
Quoted 7 lines · Qiang Yu
Do not use user space bo handles directly and left the user to kernel copy work to drivers calling this function.
This is for driver like lima which does not pass gem bo handles continously in an array in ioctl argument.
Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Tomeu Vizoso <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Qiang Yu <[email protected]>--- drivers/gpu/drm/drm_gem.c | 28 +++++++------------------ drivers/gpu/drm/panfrost/panfrost_drv.c | 23 +++++++++++++++++---Please keep the current variant. While only panfrost is converted ATM, vc4 and v3d will use this too.
Quoted 25 lines
include/drm/drm_gem.h | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_gem.c +2
-2@@ -679,11 +679,11 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,/** * drm_gem_objects_lookup - look up GEM objects from an array of handles * @filp: DRM file private date -* @bo_handles: user pointer to array of userspace handle +* @bo_handles: array of GEM object handles * @count: size of handle array * @objs_out: returned pointer to array of drm_gem_object pointers * -* Takes an array of userspace handles and returns a newly allocated array of +* Takes an array of GEM object handles and returns a newly allocated array of * GEM objects. * * For a single handle lookup, use drm_gem_object_lookup(). @@ -695,11 +695,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,* failure. 0 is returned on success. * */
Quoted 9 lines
drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 699
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +1
-1-int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out)Either split into
drm_gem_objects_lookup()and adrm_gem_objects_lookup_user()with the latter calling the former or just make the helper take both a user and u32* ptr with the expectation that only one of them is non-NULL.
OK, I prefer the first way, will send v2 for it.
Thanks,
Qiang
Quoted 1 line
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/6] drm/gem: refine drm_gem_objects_lookup
Quoted 56 lines · Qiang Yu
Quoted 46 lines · Rob Herring
Quoted 7 lines · Qiang Yu
Do not use user space bo handles directly and left the user to kernel copy work to drivers calling this function.
This is for driver like lima which does not pass gem bo handles continously in an array in ioctl argument.
Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Tomeu Vizoso <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Qiang Yu <[email protected]>--- drivers/gpu/drm/drm_gem.c | 28 +++++++------------------ drivers/gpu/drm/panfrost/panfrost_drv.c | 23 +++++++++++++++++---Please keep the current variant. While only panfrost is converted ATM, vc4 and v3d will use this too.
Quoted 25 lines
include/drm/drm_gem.h | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_gem.c +2
-2@@ -679,11 +679,11 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,/** * drm_gem_objects_lookup - look up GEM objects from an array of handles * @filp: DRM file private date -* @bo_handles: user pointer to array of userspace handle +* @bo_handles: array of GEM object handles * @count: size of handle array * @objs_out: returned pointer to array of drm_gem_object pointers * -* Takes an array of userspace handles and returns a newly allocated array of +* Takes an array of GEM object handles and returns a newly allocated array of * GEM objects. * * For a single handle lookup, use drm_gem_object_lookup(). @@ -695,11 +695,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,* failure. 0 is returned on success. * */ Quoted 9 lines
drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 699
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +1
-1-int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out)Either split into
drm_gem_objects_lookup()and adrm_gem_objects_lookup_user()with the latter calling the former or just make the helper take both a user and u32* ptr with the expectation that only one of them is non-NULL.
Quoted 1 line
OK, I prefer the first way, will send v2 for it.
Note that hopefully soon (Christian König is working on it) we'll have ww_mutex locking helpers, which will introduce a drm_gem_operation_ctx. Once we have that I think we can unify a lot of these helpers (Gerd Hoffmann has looked into it) all while making them more flexible (i.e. not only works with arrays). So might be worth to coordinate a bit here, and maybe hold off on just this part for lima for a bit.
-Daniel
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
Qiang Yu
maintainerRe: [PATCH 1/6] drm/gem: refine drm_gem_objects_lookup
Quoted 58 lines · Daniel Vetter
Quoted 56 lines · Qiang Yu
Quoted 55 lines · Rob Herring
Quoted 7 lines · Qiang Yu
Do not use user space bo handles directly and left the user to kernel copy work to drivers calling this function.
This is for driver like lima which does not pass gem bo handles continously in an array in ioctl argument.
Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Tomeu Vizoso <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Qiang Yu <[email protected]>--- drivers/gpu/drm/drm_gem.c | 28 +++++++------------------ drivers/gpu/drm/panfrost/panfrost_drv.c | 23 +++++++++++++++++---Please keep the current variant. While only panfrost is converted ATM, vc4 and v3d will use this too.
Quoted 22 lines
include/drm/drm_gem.h | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_gem.c +2
-2@@ -679,11 +679,11 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,/** * drm_gem_objects_lookup - look up GEM objects from an array of handles * @filp: DRM file private date -* @bo_handles: user pointer to array of userspace handle +* @bo_handles: array of GEM object handles * @count: size of handle array * @objs_out: returned pointer to array of drm_gem_object pointers * -* Takes an array of userspace handles and returns a newly allocated array of +* Takes an array of GEM object handles and returns a newly allocated array of * GEM objects. * * For a single handle lookup, use drm_gem_object_lookup(). drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 699
Quoted 6 lines
drivers/gpu/drm/drm_gem.c +1
-1@@ -695,11 +695,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,* failure. 0 is returned on success. * */ -int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out)Either split into
drm_gem_objects_lookup()and adrm_gem_objects_lookup_user()with the latter calling the former or just make the helper take both a user and u32* ptr with the expectation that only one of them is non-NULL.
Quoted 8 lines
Quoted 1 line
OK, I prefer the first way, will send v2 for it.
Note that hopefully soon (Christian König is working on it) we'll have
ww_mutexlocking helpers, which will introduce adrm_gem_operation_ctx. Once we have that I think we can unify a lot of these helpers (Gerd Hoffmann has looked into it) all while making them more flexible (i.e. not only works with arrays). So might be worth to coordinate a bit here, and maybe hold off on just this part for lima for a bit.
I don't know the context of these works, so I think I'd better wait some time for the new interface and send the rest of lima patches as v4.
Thanks,
Qiang
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/6] drm/gem: refine drm_gem_objects_lookup
Quoted 68 lines · Qiang Yu
Quoted 58 lines · Daniel Vetter
Quoted 56 lines · Qiang Yu
Quoted 55 lines · Rob Herring
Quoted 7 lines · Qiang Yu
Do not use user space bo handles directly and left the user to kernel copy work to drivers calling this function.
This is for driver like lima which does not pass gem bo handles continously in an array in ioctl argument.
Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Tomeu Vizoso <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Qiang Yu <[email protected]>--- drivers/gpu/drm/drm_gem.c | 28 +++++++------------------ drivers/gpu/drm/panfrost/panfrost_drv.c | 23 +++++++++++++++++---Please keep the current variant. While only panfrost is converted ATM, vc4 and v3d will use this too.
Quoted 22 lines
include/drm/drm_gem.h | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_gem.c +2
-2@@ -679,11 +679,11 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,/** * drm_gem_objects_lookup - look up GEM objects from an array of handles * @filp: DRM file private date -* @bo_handles: user pointer to array of userspace handle +* @bo_handles: array of GEM object handles * @count: size of handle array * @objs_out: returned pointer to array of drm_gem_object pointers * -* Takes an array of userspace handles and returns a newly allocated array of +* Takes an array of GEM object handles and returns a newly allocated array of * GEM objects. * * For a single handle lookup, use drm_gem_object_lookup(). drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 699
Quoted 6 lines
drivers/gpu/drm/drm_gem.c +1
-1@@ -695,11 +695,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,* failure. 0 is returned on success. * */ -int drm_gem_objects_lookup (struct drm_file *filp,void __user *bo_handles, +int drm_gem_objects_lookup (struct drm_file *filp,u32 *bo_handles,int count,struct drm_gem_object ***objs_out)Either split into
drm_gem_objects_lookup()and adrm_gem_objects_lookup_user()with the latter calling the former or just make the helper take both a user and u32* ptr with the expectation that only one of them is non-NULL.Quoted 8 lines
Quoted 1 line
OK, I prefer the first way, will send v2 for it.
Note that hopefully soon (Christian König is working on it) we'll have
ww_mutexlocking helpers, which will introduce adrm_gem_operation_ctx. Once we have that I think we can unify a lot of these helpers (Gerd Hoffmann has looked into it) all while making them more flexible (i.e. not only works with arrays). So might be worth to coordinate a bit here, and maybe hold off on just this part for lima for a bit.
Quoted 2 lines
I don't know the context of these works, so I think I'd better wait some time for the new interface and send the rest of lima patches as v4.
Yeah I think with the new stuff we might be able to avoid the kvmalloc_array, that's not really a great idea to plug into a fastpath like execbuf. The other patches can imo still go ahead, I don't want to hold up everything :-)
-Daniel
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
Qiang Yu
maintainerPATCH 2/6 drm/v3d: use drm_gem_objects_lookup
In reply to Qiang Yu--- drivers/gpu/drm/v3d/v3d_gem.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-)
drivers/gpu/drm/v3d/v3d_gem.c +6 -29
@@ -291,8 +291,7 @@ v3d_lookup_bos(struct drm_device *dev, u32 bo_count) {u32 *handles; -int ret =0 ; -int i; +int ret; job->bo_count = bo_count;
@@ -304,19 +303,10 @@ v3d_lookup_bos(struct drm_device *dev,return -EINVAL ; } - job->bo =kvmalloc_array (job->bo_count, -sizeof (struct drm_gem_cma_object *), -GFP_KERNEL | __GFP_ZERO); -if (!job->bo) { -DRM_DEBUG ("Failed to allocate validated BO pointers\n" ); -return -ENOMEM ; - } - handles =kvmalloc_array (job->bo_count,sizeof (u32),GFP_KERNEL );if (!handles) { - ret = -ENOMEM ;DRM_DEBUG ("Failed to allocate incoming GEM handles\n" ); - goto fail; +return -ENOMEM ; } if (copy_from_user(handles,
@@ -324,26 +314,13 @@ v3d_lookup_bos(struct drm_device *dev, job->bo_count * sizeof(u32))) { ret = -EFAULT ;DRM_DEBUG ("Failed to copy in GEM handles\n" ); - goto fail; + goto out; } -spin_lock (&file_priv->table_lock); -for (i =0 ; i < job->bo_count; i++) { -struct drm_gem_object *bo =idr_find (&file_priv->object_idr, - handles[i]); -if (!bo) { -DRM_DEBUG ("Failed to look up GEM BO %d: %d\n" , - i, handles[i]); - ret = -ENOENT ; -spin_unlock (&file_priv->table_lock); - goto fail; - } -drm_gem_object_get (bo); - job->bo[i] = bo; - } -spin_unlock (&file_priv->table_lock); + ret =drm_gem_objects_lookup (file_priv, handles, + job->bo_count, &job->bo); -fail: +out:kvfree (handles);return ret; }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Qiang Yu
maintainerPATCH 3/6 drm/lima: use drm_gem_objects_lookup
In reply to Qiang Yu--- drivers/gpu/drm/lima/lima_drv.c | 5 ++- drivers/gpu/drm/lima/lima_gem.c | 73 +++++++++++++++++++-------------- 2 files changed, 46 insertions(+), 32 deletions(-)
drivers/gpu/drm/lima/lima_drv.c +3 -2
@@ -108,7 +108,7 @@ static int lima_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_if (args->frame_size != pipe->frame_size)return -EINVAL ; - bos =kvcalloc (args->nr_bos,sizeof (*submit.bos) +sizeof (*submit.lbos),GFP_KERNEL ); + bos =kvcalloc (args->nr_bos,sizeof (*submit.bos),GFP_KERNEL );if (!bos)return -ENOMEM ;
@@ -142,7 +142,6 @@ static int lima_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_ submit.pipe = args->pipe; submit.bos = bos; - submit.lbos = (void *)bos + size; submit.nr_bos = args->nr_bos; submit.task = task; submit.ctx = ctx;
@@ -159,6 +158,8 @@ static int lima_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_kmem_cache_free (pipe->task_slab, task); out0:kvfree (bos); +if (submit.lbos) +kvfree (submit.lbos);return err; }
drivers/gpu/drm/lima/lima_gem.c +43 -30
123 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 4/6 drm/lima: use drm_gem_shmem_helpers
In reply to Qiang YuDo 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;
@@ -241,16 +240,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,
@@ -259,10 +249,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",
@@ -270,11 +256,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 5/6 drm/lima: use drm_gem_(un)lock_reservations
In reply to Qiang Yu--- drivers/gpu/drm/lima/lima_gem.c | 64 ++++----------------------------- 1 file changed, 6 insertions(+), 58 deletions(-)
drivers/gpu/drm/lima/lima_gem.c +6 -58
@@ -166,61 +166,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;
@@ -280,7 +225,8 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit) } } - 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_out2;
@@ -313,7 +259,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);
@@ -330,7 +277,8 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit) err_out4:lima_sched_task_fini (submit->task); err_out3: -lima_gem_unlock_bos (bos, submit->nr_bos, &ctx); +drm_gem_unlock_reservations ((struct drm_gem_object **)bos, + submit->nr_bos, &ctx); err_out2:for (i =0 ; i < submit->nr_bos; i++)lima_vm_bo_del (vm, 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 6/6 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
@@ -313,7 +313,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
Steven Price
maintainerQuoted 8 lines · Qiang Yu
By using shared drm helpers:
1.drm_gem_objects_lookup
2. drm_gem_(un)lock_reservations
3.drm_gem_shmem_helpers
we can simplify lima driver a lot and benifit from updates to these functions.
drm_gem_objects_lookupneed a refine in order to be used by lima.
I'm not convinced this is actually a great idea. v3d looks like it could already use the existing drm_gem_objects_lookup mechanism: see below (untested) patch. So we're actually adding more code to Panfrost (and v3d) just for the quirk in lima that the supplied array of BOs is interleaved with flags. And the diffstat for the lima change adds lines too! So it doesn't look like a net win to me.
I've not looked at patches 4-6, but the diffstat on those looks better!
Steve
---8<----
drivers/gpu/drm/v3d/v3d_gem.c +3 -42
@@ -304,48 +304,9 @@ v3d_lookup_bos(struct drm_device *dev,return -EINVAL ; } - job->bo =kvmalloc_array (job->bo_count, -sizeof (struct drm_gem_cma_object *), -GFP_KERNEL | __GFP_ZERO); -if (!job->bo) { -DRM_DEBUG ("Failed to allocate validated BO pointers\n" ); -return -ENOMEM ; - } - - handles =kvmalloc_array (job->bo_count,sizeof (u32),GFP_KERNEL ); -if (!handles) { - ret = -ENOMEM ; -DRM_DEBUG ("Failed to allocate incoming GEM handles\n" ); - goto fail; - } - -if (copy_from_user (handles, - (void __user *)(uintptr_t )bo_handles, - job->bo_count *sizeof (u32))) { - ret = -EFAULT ; -DRM_DEBUG ("Failed to copy in GEM handles\n" ); - goto fail; - } - -spin_lock (&file_priv->table_lock); -for (i =0 ; i < job->bo_count; i++) { -struct drm_gem_object *bo =idr_find (&file_priv->object_idr, - handles[i]); -if (!bo) { -DRM_DEBUG ("Failed to look up GEM BO %d: %d\n" , - i, handles[i]); - ret = -ENOENT ; -spin_unlock (&file_priv->table_lock); - goto fail; - } -drm_gem_object_get (bo); - job->bo[i] = bo; - } -spin_unlock (&file_priv->table_lock); - -fail: -kvfree (handles); -return ret; +return drm_gem_objects_lookup (file_priv, + (void __user *)(uintptr_t )bo_handles, + job->bo_count, &job->bo); } static void
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel