[PATCH 10/13] drm/amdgpu: get_hive_id from amdgpu side

[Christian König]

Am 05.09.2018 um 17:31 schrieb shaoyunl:
> From: Shaoyun Liu <Shaoyun.Liu at amd.com>
>
> Retrieve hive_id from amdgpu device
>
> Change-Id: I9bb4d87870edf638b477a9088f14bc84b70e71e2
> Signed-off-by: Shaoyun Liu <Shaoyun.Liu at amd.com>
> Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>

Patches #10-#13 are Acked-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c        | 7 +++++++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h        | 1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 +
>   3 files changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 1a0824e..5661c34 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -411,6 +411,13 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
>   	return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
>   }
>   
> +uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)
> +{
> +	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> +
> +	return adev->gmc.xgmi.hive_id;
> +}
> +
>   int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
>   				uint32_t vmid, uint64_t gpu_addr,
>   				uint32_t *ib_cmd, uint32_t ib_len)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 2a1da3f..41e7dfc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -145,6 +145,7 @@ uint64_t get_gpu_clock_counter(struct kgd_dev *kgd);
>   uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd);
>   void get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info);
>   uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);
> +uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd);
>   
>   #define read_user_wptr(mmptr, wptr, dst)				\
>   	({								\
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index 3dc987c..94d39a3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -216,6 +216,7 @@ static const struct kfd2kgd_calls kfd2kgd = {
>   	.submit_ib = amdgpu_amdkfd_submit_ib,
>   	.gpu_recover = amdgpu_amdkfd_gpu_reset,
>   	.set_compute_idle = amdgpu_amdkfd_set_compute_idle
> +	.get_hive_id = amdgpu_amdkfd_get_hive_id,
>   };
>   
>   struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void)