[PATCH v2 10/12] drm/amdgpu: remove unused functions and variables

[Felix Kuehling]

On 2023-04-12 12:25, Shashank Sharma wrote:
> This patch removes some variables and functions from KFD
> doorbell handling code, which are no more required since
> doorbell manager is handling doorbell calculations.
>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Cc: Christian Koenig <christian.koenig at amd.com>
> Signed-off-by: Shashank Sharma <shashank.sharma at amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 32 -----------------------
>   drivers/gpu/drm/amd/amdkfd/kfd_priv.h     | 12 ---------
>   2 files changed, 44 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c b/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c
> index 718cfe9cb4f5..f4088cfd52db 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c
> @@ -193,38 +193,6 @@ void write_kernel_doorbell64(void __iomem *db, u64 value)
>   	}
>   }
>   
> -unsigned int kfd_get_doorbell_dw_offset_in_bar(struct kfd_dev *kfd,
> -					struct kfd_process_device *pdd,
> -					unsigned int doorbell_id)
> -{
> -	/*
> -	 * doorbell_base_dw_offset accounts for doorbells taken by KGD.
> -	 * index * kfd_doorbell_process_slice/sizeof(u32) adjusts to
> -	 * the process's doorbells. The offset returned is in dword
> -	 * units regardless of the ASIC-dependent doorbell size.
> -	 */
> -	if (!kfd->shared_resources.enable_mes)
> -		return kfd->doorbell_base_dw_offset +
> -			pdd->doorbell_index
> -			* kfd_doorbell_process_slice(kfd) / sizeof(u32) +
> -			doorbell_id *
> -			kfd->device_info.doorbell_size / sizeof(u32);
> -	else
> -		return amdgpu_mes_get_doorbell_dw_offset_in_bar(
> -				(struct amdgpu_device *)kfd->adev,
> -				pdd->doorbell_index, doorbell_id);
> -}
> -
> -uint64_t kfd_get_number_elems(struct kfd_dev *kfd)
> -{
> -	uint64_t num_of_elems = (kfd->shared_resources.doorbell_aperture_size -
> -				kfd->shared_resources.doorbell_start_offset) /
> -					kfd_doorbell_process_slice(kfd) + 1;
> -
> -	return num_of_elems;
> -
> -}
> -
>   phys_addr_t kfd_get_process_doorbells(struct kfd_process_device *pdd)
>   {
>   	struct amdgpu_device *adev = pdd->dev->adev;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> index dfff77379acb..1bc6a8ed8cda 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -257,15 +257,6 @@ struct kfd_dev {
>   
>   	unsigned int id;		/* topology stub index */
>   
> -	phys_addr_t doorbell_base;	/* Start of actual doorbells used by
> -					 * KFD. It is aligned for mapping
> -					 * into user mode
> -					 */
> -	size_t doorbell_base_dw_offset;	/* Offset from the start of the PCI
> -					 * doorbell BAR to the first KFD
> -					 * doorbell in dwords. GFX reserves
> -					 * the segment before this offset.
> -					 */
>   	u32 __iomem *doorbell_kernel_ptr; /* This is a pointer for a doorbells
>   					   * page used by kernel queue
>   					   */
> @@ -276,8 +267,6 @@ struct kfd_dev {
>   
>   	const struct kfd2kgd_calls *kfd2kgd;
>   	struct mutex doorbell_mutex;
> -	DECLARE_BITMAP(doorbell_available_index,
> -			KFD_MAX_NUM_OF_QUEUES_PER_PROCESS);
>   
>   	void *gtt_mem;
>   	uint64_t gtt_start_gpu_addr;
> @@ -754,7 +743,6 @@ struct kfd_process_device {
>   	struct attribute attr_evict;
>   
>   	struct kobject *kobj_stats;
> -	unsigned int doorbell_index;
>   
>   	/*
>   	 * @cu_occupancy: Reports occupancy of Compute Units (CU) of a process