On 2/6/2025 1:26 PM, Emily Deng wrote:
> In sriov multiple vf, Set CP_HQD_PQ_DOORBELL_CONTROL.DOORBELL_MODE to 1 to
> read WPTR from MQD.
>
> Signed-off-by: Emily Deng <emily.d...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2 +-
> .../gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 25 +++++++++++++++++--
> 2 files changed, 24 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> index 2ba185875baa..479b790d0633 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> @@ -1857,7 +1857,7 @@ static int gfx_v9_4_3_xcc_mqd_init(struct amdgpu_ring
> *ring, int xcc_id)
> DOORBELL_SOURCE, 0);
> tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_DOORBELL_CONTROL,
> DOORBELL_HIT, 0);
> - if (amdgpu_sriov_vf(adev))
> + if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
Would be useful if this is wrapped as amdgpu_sriov_multi_vf_mode(adev)
Thanks,
Lijo
> tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_DOORBELL_CONTROL,
> DOORBELL_MODE, 1);
> } else {
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> index ff417d5361c4..c8b2d7a8bd0f 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> @@ -551,7 +551,7 @@ static void init_mqd_hiq_v9_4_3(struct mqd_manager *mm,
> void **mqd,
> m->cp_hqd_pq_control |= CP_HQD_PQ_CONTROL__NO_UPDATE_RPTR_MASK |
> 1 <<
> CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT |
> 1 <<
> CP_HQD_PQ_CONTROL__KMD_QUEUE__SHIFT;
> - if (amdgpu_sriov_vf(mm->dev->adev))
> + if (amdgpu_sriov_vf(mm->dev->adev) &&
> !amdgpu_sriov_is_pp_one_vf(mm->dev->adev))
> m->cp_hqd_pq_doorbell_control |= 1 <<
>
> CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_MODE__SHIFT;
> m->cp_mqd_stride_size = kfd_hiq_mqd_stride(mm->dev);
> @@ -724,6 +724,10 @@ static void update_mqd_v9_4_3(struct mqd_manager *mm,
> void *mqd,
> m = get_mqd(mqd + size * xcc);
> update_mqd(mm, m, q, minfo);
>
> + if (amdgpu_sriov_vf(mm->dev->adev) &&
> + !amdgpu_sriov_is_pp_one_vf(mm->dev->adev))
> + m->cp_hqd_pq_doorbell_control |= 1 <<
> +
> CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_MODE__SHIFT;
> update_cu_mask(mm, m, minfo, xcc);
>
> if (q->format == KFD_QUEUE_FORMAT_AQL) {
> @@ -746,6 +750,22 @@ static void update_mqd_v9_4_3(struct mqd_manager *mm,
> void *mqd,
> }
> }
>
> +static void restore_mqd_v9_4_3(struct mqd_manager *mm, void **mqd,
> + struct kfd_mem_obj *mqd_mem_obj, uint64_t *gart_addr,
> + struct queue_properties *qp,
> + const void *mqd_src,
> + const void *ctl_stack_src, u32 ctl_stack_size)
> +{
> + restore_mqd(mm, mqd, mqd_mem_obj, gart_addr, qp, mqd_src,
> ctl_stack_src, ctl_stack_size);
> + if (amdgpu_sriov_vf(mm->dev->adev) &&
> + !amdgpu_sriov_is_pp_one_vf(mm->dev->adev)) {
> + struct v9_mqd *m;
> +
> + m = (struct v9_mqd *) mqd_mem_obj->cpu_ptr;
> + m->cp_hqd_pq_doorbell_control |= 1 <<
> +
> CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_MODE__SHIFT;
> + }
> +}
> static int destroy_mqd_v9_4_3(struct mqd_manager *mm, void *mqd,
> enum kfd_preempt_type type, unsigned int timeout,
> uint32_t pipe_id, uint32_t queue_id)
> @@ -880,7 +900,6 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE
> type,
> mqd->is_occupied = kfd_is_occupied_cp;
> mqd->get_checkpoint_info = get_checkpoint_info;
> mqd->checkpoint_mqd = checkpoint_mqd;
> - mqd->restore_mqd = restore_mqd;
> mqd->mqd_size = sizeof(struct v9_mqd);
> mqd->mqd_stride = mqd_stride_v9;
> #if defined(CONFIG_DEBUG_FS)
> @@ -892,12 +911,14 @@ struct mqd_manager *mqd_manager_init_v9(enum
> KFD_MQD_TYPE type,
> mqd->init_mqd = init_mqd_v9_4_3;
> mqd->load_mqd = load_mqd_v9_4_3;
> mqd->update_mqd = update_mqd_v9_4_3;
> + mqd->restore_mqd = restore_mqd_v9_4_3;
> mqd->destroy_mqd = destroy_mqd_v9_4_3;
> mqd->get_wave_state = get_wave_state_v9_4_3;
> } else {
> mqd->init_mqd = init_mqd;
> mqd->load_mqd = load_mqd;
> mqd->update_mqd = update_mqd;
> + mqd->restore_mqd = restore_mqd;
> mqd->destroy_mqd = kfd_destroy_mqd_cp;
> mqd->get_wave_state = get_wave_state;
> }
