Re: [PATCH v2 1/3] drm/amdgpu: Fetch MES scheduler/KIQ versions

[Felix Kuehling <felix.kuehling@amd.com>]

Am 2022-06-10 um 13:13 schrieb Graham Sider:
> Store MES scheduler and MES KIQ version numbers in amdgpu_mes for GFX11.
>
> Signed-off-by: Graham Sider <Graham.Sider@amd.com>

Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h |  3 +++
>   drivers/gpu/drm/amd/amdgpu/mes_v11_0.c  | 12 ++++++++++++
>   2 files changed, 15 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
> index 92ddee5e33db..aa06c8396ee0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
> @@ -64,6 +64,9 @@ struct amdgpu_mes {
>   
>   	spinlock_t                      queue_id_lock;
>   
> +	uint32_t			sched_version;
> +	uint32_t			kiq_version;
> +
>   	uint32_t                        total_max_queue;
>   	uint32_t                        doorbell_id_offset;
>   	uint32_t                        max_doorbell_slices;
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> index e4eb87689f7f..2a9ef308e71c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> @@ -890,6 +890,18 @@ static int mes_v11_0_queue_init(struct amdgpu_device *adev,
>   		mes_v11_0_queue_init_register(ring);
>   	}
>   
> +	/* get MES scheduler/KIQ versions */
> +	mutex_lock(&adev->srbm_mutex);
> +	soc21_grbm_select(adev, 3, pipe, 0, 0);
> +
> +	if (pipe == AMDGPU_MES_SCHED_PIPE)
> +		adev->mes.sched_version = RREG32_SOC15(GC, 0, regCP_MES_GP3_LO);
> +	else if (pipe == AMDGPU_MES_KIQ_PIPE && adev->enable_mes_kiq)
> +		adev->mes.kiq_version = RREG32_SOC15(GC, 0, regCP_MES_GP3_LO);
> +
> +	soc21_grbm_select(adev, 0, 0, 0, 0);
> +	mutex_unlock(&adev->srbm_mutex);
> +
>   	return 0;
>   }
>