Skip to contentSkip to conversation

drm/amdgpu: replace idr_init() by idr_init_base()

PATCH Superseded Deepak R Varma 2 participants 2 messages Nov 4, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: replace idr_init() by idr_init_base()

idr_init() uses base 0 which is an invalid identifier. The new function idr_init_base allows IDR to set the ID lookup from base 1. This avoids all lookups that otherwise starts from 0 since 0 is always unused.

References: commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient")

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
index c80d8339f58c..b98ae173a9de 100644
@@ -576,7 +576,7 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx,
 void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr)
 {
 	mutex_init(&mgr->lock);
-	idr_init(&mgr->ctx_handles);
+	idr_init_base(&mgr->ctx_handles, 1);
 }
 
 long amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr, long timeout)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
index efda38349a03..d65a1888683b 100644
@@ -1052,7 +1052,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);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
index df110afa97bf..0154282771c7 100644
@@ -3199,7 +3199,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev)
 	adev->vm_manager.vm_update_mode = 0;
 #endif
 
-	idr_init(&adev->vm_manager.pasid_idr);
+	idr_init_base(&adev->vm_manager.pasid_idr, 1);
 	spin_lock_init(&adev->vm_manager.pasid_lock);
 }
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

Am 04.11.20 um 16:16 schrieb Deepak R Varma:

Quoted 7 lines

idr_init() uses base 0 which is an invalid identifier. The new function idr_init_base allows IDR to set the ID lookup from base 1. This avoids all lookups that otherwise starts from 0 since 0 is always unused.

References: commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient")

Quoted 45 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c  | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
index c80d8339f58c..b98ae173a9de 100644
@@ -576,7 +576,7 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx,
  void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr)
  {
  	mutex_init(&mgr->lock);
-	idr_init(&mgr->ctx_handles);
+	idr_init_base(&mgr->ctx_handles, 1);
  }
 
  long amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr, long timeout)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
index efda38349a03..d65a1888683b 100644
@@ -1052,7 +1052,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);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
index df110afa97bf..0154282771c7 100644
@@ -3199,7 +3199,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev)
  	adev->vm_manager.vm_update_mode = 0;
  #endif
 
-	idr_init(&adev->vm_manager.pasid_idr);
+	idr_init_base(&adev->vm_manager.pasid_idr, 1);
  	spin_lock_init(&adev->vm_manager.pasid_lock);
  }