drm: use idr_init_base() over idr_init() if applicable
Subsystems (5)
cover drm: use idr_init_base() over idr_init() if applicable
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with idr_init_base(&idr, 1) rather than idr_init(&idr) in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.
Danilo Krummrich (10):
drm/amdgpu: use idr_init_base() to initialize mgr->ctx_handles drm/amdgpu: use idr_init_base() to initialize fpriv->bo_list_handles
drm: use idr_init_base() to initialize master->magic_map
drm: use idr_init_base() to initialize master->lessee_idr
drm: use idr_init_base() to initialize mode_config.object_idr
drm: use idr_init_base() to initialize mode_config.tile_idr drm/sis: use idr_init_base() to initialize dev_priv->object_idr drm/v3d: use idr_init_base() to initialize v3d_priv->perfmon.idr drm/via: use idr_init_base() to initialize dev_priv->object_idr drm/todo: remove task for idr_init_base()
Documentation/gpu/todo.rst | 12 ------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/drm_auth.c | 4 ++-- drivers/gpu/drm/drm_mode_config.c | 4 ++-- drivers/gpu/drm/sis/sis_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +- drivers/gpu/drm/via/via_map.c | 2 +- 8 files changed, 9 insertions(+), 21 deletions(-)
Signature · 1 line
2.36.1
PATCH 1/10 drm/amdgpu: use idr_init_base() to initialize mgr->ctx_handles
From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
@@ -841,7 +841,7 @@ void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr, mgr->adev = adev;mutex_init (&mgr->lock); -idr_init (&mgr->ctx_handles); +idr_init_base (&mgr->ctx_handles,1 );for (i =0 ; i <AMDGPU_HW_IP_NUM ; ++i)atomic64_set (&mgr->time_spend[i],0 );
Signature · 1 line
2.36.1
PATCH 2/10 drm/amdgpu: use idr_init_base() to initialize fpriv->bo_list_handles
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -1148,7 +1148,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) }mutex_init (&fpriv->bo_list_lock); -idr_init (&fpriv->bo_list_handles); +idr_init_base (&fpriv->bo_list_handles,1 );amdgpu_ctx_mgr_init (&fpriv->ctx_mgr, adev);
Signature · 1 line
2.36.1
PATCH 3/10 drm: use idr_init_base() to initialize master->magic_map
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/drm_auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_auth.c +1 -1
@@ -140,7 +140,7 @@ struct drm_master *drm_master_create(struct drm_device *dev)kref_init (&master->refcount);drm_master_legacy_init (master); -idr_init (&master->magic_map); +idr_init_base (&master->magic_map,1 ); master->dev = dev;/* initialize the tree of output resource lessees */
Signature · 1 line
2.36.1
PATCH 4/10 drm: use idr_init_base() to initialize master->lessee_idr
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/drm_auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_auth.c +1 -1
@@ -147,7 +147,7 @@ struct drm_master *drm_master_create(struct drm_device *dev)INIT_LIST_HEAD (&master->lessees);INIT_LIST_HEAD (&master->lessee_list);idr_init (&master->leases); -idr_init (&master->lessee_idr); +idr_init_base (&master->lessee_idr,1 );return master; }
Signature · 1 line
2.36.1
PATCH 5/10 drm: use idr_init_base() to initialize mode_config.object_idr
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/drm_mode_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_mode_config.c +1 -1
@@ -411,7 +411,7 @@ int drmm_mode_config_init(struct drm_device *dev)INIT_LIST_HEAD (&dev->mode_config.property_blob_list);INIT_LIST_HEAD (&dev->mode_config.plane_list);INIT_LIST_HEAD (&dev->mode_config.privobj_list); -idr_init (&dev->mode_config.object_idr); +idr_init_base (&dev->mode_config.object_idr,1 );idr_init (&dev->mode_config.tile_idr);ida_init (&dev->mode_config.connector_ida);spin_lock_init (&dev->mode_config.connector_list_lock);
Signature · 1 line
2.36.1
PATCH 6/10 drm: use idr_init_base() to initialize mode_config.tile_idr
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/drm_mode_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_mode_config.c +1 -1
@@ -412,7 +412,7 @@ int drmm_mode_config_init(struct drm_device *dev)INIT_LIST_HEAD (&dev->mode_config.plane_list);INIT_LIST_HEAD (&dev->mode_config.privobj_list);idr_init_base (&dev->mode_config.object_idr,1 ); -idr_init (&dev->mode_config.tile_idr); +idr_init_base (&dev->mode_config.tile_idr,1 );ida_init (&dev->mode_config.connector_ida);spin_lock_init (&dev->mode_config.connector_list_lock);
Signature · 1 line
2.36.1
PATCH 7/10 drm/sis: use idr_init_base() to initialize dev_priv->object_idr
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/sis/sis_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/sis/sis_drv.c +1 -1
@@ -50,7 +50,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)if (dev_priv ==NULL )return -ENOMEM ; -idr_init (&dev_priv->object_idr); +idr_init_base (&dev_priv->object_idr,1 ); dev->dev_private = (void *)dev_priv; dev_priv->chipset = chipset;
Signature · 1 line
2.36.1
PATCH 8/10 drm/v3d: use idr_init_base() to initialize v3d_priv->perfmon.idr
In reply to [email protected]From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/v3d/v3d_perfmon.c +1 -1
@@ -95,7 +95,7 @@ struct v3d_perfmon *v3d_perfmon_find(struct v3d_file_priv *v3d_priv, int id)void v3d_perfmon_open_file (struct v3d_file_priv *v3d_priv) {mutex_init (&v3d_priv->perfmon.lock); -idr_init (&v3d_priv->perfmon.idr); +idr_init_base (&v3d_priv->perfmon.idr,1 ); }static int v3d_perfmon_idr_del (int id,void *elem,void *data)
Signature · 1 line
2.36.1
PATCH 9/10 drm/via: use idr_init_base() to initialize dev_priv->object_idr
From: Danilo Krummrich <[email protected]>
idr_init_base(), implemented by commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient"), let us set an arbitrary base other than idr_init(), which uses base 0.
Since, for this IDR, no ID < 1 is ever requested/allocated, using idr_init_base(&idr, 1) avoids unnecessary tree walks.
--- drivers/gpu/drm/via/via_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/via/via_map.c +1 -1
@@ -106,7 +106,7 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)if (dev_priv ==NULL )return -ENOMEM ; -idr_init (&dev_priv->object_idr); +idr_init_base (&dev_priv->object_idr,1 ); dev->dev_private = (void *)dev_priv; dev_priv->chipset = chipset;
Signature · 1 line
2.36.1
PATCH 10/10 drm/todo: remove task for idr_init_base()
In reply to [email protected]From: Danilo Krummrich <[email protected]>
All IDRs in the DRM core and drivers which are applicable for using idr_init_base() over idr_init() should be set up to use a proper base in order to avoid unnecessary tree walks.
--- Documentation/gpu/todo.rst | 12 ------------ 1 file changed, 12 deletions(-)
Documentation/gpu/todo.rst +0 -12
@@ -322,18 +322,6 @@ Contact: Daniel Vetter, Noralf Tronnes Level: Advanced -idr_init_base() ---------------- - -DRM core&drivers uses a lot of idr (integer lookup directories) for mapping -userspace IDs to internal objects, and in most places ID=0 means NULL and hence -is never used. Switching to idr_init_base() for these would make the idr more -efficient. - -Contact: Daniel Vetter - -Level: Starter - struct drm_gem_object_funcs ---------------------------
Signature · 1 line
2.36.1
Christian König
maintainerAm 01.07.22 um 20:52 schrieb [email protected]:
Quoted 5 lines
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with
idr_init_base(&idr, 1)rather thanidr_init(&idr)in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.
Feel free to add Reviewed-by: Christian König <[email protected]> for the two amdgpu patches.
And an Acked-by: Christian König <[email protected]> for the rest.
Regards,
Christian.
Quoted 23 lines
Danilo Krummrich (10):
drm/amdgpu: use idr_init_base() to initialize mgr->ctx_handles drm/amdgpu: use idr_init_base() to initialize fpriv->bo_list_handles drm: use idr_init_base() to initialize master->magic_map drm: use idr_init_base() to initialize master->lessee_idr drm: use idr_init_base() to initialize mode_config.object_idr drm: use idr_init_base() to initialize mode_config.tile_idr drm/sis: use idr_init_base() to initialize dev_priv->object_idr drm/v3d: use idr_init_base() to initialize v3d_priv->perfmon.idr drm/via: use idr_init_base() to initialize dev_priv->object_idr drm/todo: remove task for idr_init_base()Documentation/gpu/todo.rst | 12 ------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/drm_auth.c | 4 ++-- drivers/gpu/drm/drm_mode_config.c | 4 ++-- drivers/gpu/drm/sis/sis_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +- drivers/gpu/drm/via/via_map.c | 2 +- 8 files changed, 9 insertions(+), 21 deletions(-)
Hi Laurent,
Quoted 6 lines · On 7/1/22 20:52, [email protected] wrote:
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with
idr_init_base(&idr, 1)rather thanidr_init(&idr)in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.
Guess this would go through drm-misc too?
- Danilo
Quoted 22 lines
Danilo Krummrich (10):
drm/amdgpu: use idr_init_base() to initialize mgr->ctx_handles drm/amdgpu: use idr_init_base() to initialize fpriv->bo_list_handles drm: use idr_init_base() to initialize master->magic_map drm: use idr_init_base() to initialize master->lessee_idr drm: use idr_init_base() to initialize mode_config.object_idr drm: use idr_init_base() to initialize mode_config.tile_idr drm/sis: use idr_init_base() to initialize dev_priv->object_idr drm/v3d: use idr_init_base() to initialize v3d_priv->perfmon.idr drm/via: use idr_init_base() to initialize dev_priv->object_idr drm/todo: remove task for idr_init_base()Documentation/gpu/todo.rst | 12 ------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/drm_auth.c | 4 ++-- drivers/gpu/drm/drm_mode_config.c | 4 ++-- drivers/gpu/drm/sis/sis_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +- drivers/gpu/drm/via/via_map.c | 2 +- 8 files changed, 9 insertions(+), 21 deletions(-)
Dave Airlie
maintainerQuoted 11 lines · Danilo Krummrich
Hi Laurent,
Quoted 6 lines · On 7/1/22 20:52, [email protected] wrote:
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with
idr_init_base(&idr, 1)rather thanidr_init(&idr)in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.Guess this would go through drm-misc too?
Could someone from the misc team pick this up, Danilo doesn't have commit rights yet.
Dave.
Maxime Ripard
AppliedQuoted 18 lines · On Fri, 1 Jul 2022 20:52:53 +0200, [email protected] wrote:
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with
idr_init_base(&idr, 1)rather thanidr_init(&idr)in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.Danilo Krummrich (10):
drm/amdgpu: useidr_init_base()to initializemgr->ctx_handlesdrm/amdgpu: useidr_init_base()to initializefpriv->bo_list_handles
drm: useidr_init_base()to initializemaster->magic_map
drm: useidr_init_base()to initializemaster->lessee_idr
drm: useidr_init_base()to initialize mode_config.object_idr
drm: useidr_init_base()to initialize mode_config.tile_idr drm/sis: useidr_init_base()to initializedev_priv->object_idrdrm/v3d: useidr_init_base()to initializev3d_priv->perfmon.idrdrm/via: useidr_init_base()to initializedev_priv->object_idrdrm/todo: remove task foridr_init_base()
Quoted 1 line
[...]
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · On Fri, 1 Jul 2022 20:52:53 +0200, [email protected] wrote:
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with
idr_init_base(&idr, 1)rather thanidr_init(&idr)in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.Danilo Krummrich (10):
drm/amdgpu: useidr_init_base()to initializemgr->ctx_handlesdrm/amdgpu: useidr_init_base()to initializefpriv->bo_list_handles
drm: useidr_init_base()to initializemaster->magic_map
drm: useidr_init_base()to initializemaster->lessee_idr
drm: useidr_init_base()to initialize mode_config.object_idr
drm: useidr_init_base()to initialize mode_config.tile_idr drm/sis: useidr_init_base()to initializedev_priv->object_idrdrm/v3d: useidr_init_base()to initializev3d_priv->perfmon.idrdrm/via: useidr_init_base()to initializedev_priv->object_idrdrm/todo: remove task foridr_init_base()
Quoted 3 lines
Quoted 1 line
[...]
Applied to drm/drm-misc (drm-misc-next).
The via driver had changed a bit and the patch 9 didn't apply at all. I've moved the change to where it looked like it belonged, but you might want to double check.
Maxime
Quoted 20 lines · Maxime Ripard
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · On Fri, 1 Jul 2022 20:52:53 +0200, [email protected] wrote:
From: Danilo Krummrich <[email protected]>
This patch series initializes IDRs with
idr_init_base(&idr, 1)rather thanidr_init(&idr)in case for the particular IDR no IDs < 1 are ever requested - this avoids unnecessary tree walks.Danilo Krummrich (10):
drm/amdgpu: use idr_init_base() to initialize mgr->ctx_handles drm/amdgpu: use idr_init_base() to initialize fpriv->bo_list_handles drm: use idr_init_base() to initialize master->magic_map drm: use idr_init_base() to initialize master->lessee_idr drm: use idr_init_base() to initialize mode_config.object_idr drm: use idr_init_base() to initialize mode_config.tile_idr drm/sis: use idr_init_base() to initialize dev_priv->object_idr drm/v3d: use idr_init_base() to initialize v3d_priv->perfmon.idr drm/via: use idr_init_base() to initialize dev_priv->object_idr drm/todo: remove task for idr_init_base()
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
[...]
Applied to drm/drm-misc (drm-misc-next).
Thanks.
Quoted 4 lines
The via driver had changed a bit and the patch 9 didn't apply at all. I've moved the change to where it looked like it belonged, but you might want to double check.
LGTM.
- Danilo
Quoted 2 lines
Maxime