From: Candice Li Date: Fri, 5 Dec 2025 01:16:26 +0000 (+0800) Subject: drm/amd/ras: Add vram_type to ras_ta_init_flags X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90254524ee84ef812e6329a14dd76e9f53db5023;p=thirdparty%2Fkernel%2Flinux.git drm/amd/ras: Add vram_type to ras_ta_init_flags Add vram_type to ras_ta_init_flags. Signed-off-by: Candice Li Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c index 923bddd0af3a2..b86638fe0f32c 100644 --- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c +++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c @@ -216,6 +216,7 @@ static int amdgpu_ras_mgr_get_ras_ta_init_param(struct ras_core_context *ras_cor ras_ta_param->channel_dis_num = hweight32(adev->gmc.m_half_use) * 2; ras_ta_param->active_umc_mask = adev->umc.active_mask; + ras_ta_param->vram_type = (uint8_t)adev->gmc.vram_type; if (!amdgpu_ras_mgr_get_curr_nps_mode(adev, &nps_mode)) ras_ta_param->nps_mode = nps_mode; diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_psp.c b/drivers/gpu/drm/amd/ras/rascore/ras_psp.c index ccdb42d2dd605..5d556e2a7000c 100644 --- a/drivers/gpu/drm/amd/ras/rascore/ras_psp.c +++ b/drivers/gpu/drm/amd/ras/rascore/ras_psp.c @@ -507,6 +507,7 @@ static int send_load_ta_fw_cmd(struct ras_core_context *ras_core, ta_init_flags->channel_dis_num = ta_ctx->init_param.channel_dis_num; ta_init_flags->nps_mode = ta_ctx->init_param.nps_mode; ta_init_flags->active_umc_mask = ta_ctx->init_param.active_umc_mask; + ta_init_flags->vram_type = ta_ctx->init_param.vram_type; /* Setup load ras ta command */ memset(&psp_load_ta_cmd, 0, sizeof(psp_load_ta_cmd)); diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_psp.h b/drivers/gpu/drm/amd/ras/rascore/ras_psp.h index 71776fecfd664..347f5334c3f34 100644 --- a/drivers/gpu/drm/amd/ras/rascore/ras_psp.h +++ b/drivers/gpu/drm/amd/ras/rascore/ras_psp.h @@ -51,6 +51,7 @@ struct ras_ta_init_param { uint8_t channel_dis_num; uint8_t nps_mode; uint32_t active_umc_mask; + uint8_t vram_type; }; struct gpu_mem_block { diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h b/drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h index 0921e36d3274e..e910a75b30229 100644 --- a/drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h +++ b/drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h @@ -167,6 +167,7 @@ struct ras_ta_init_flags { uint8_t channel_dis_num; uint8_t nps_mode; uint32_t active_umc_mask; + uint8_t vram_type; }; struct ras_ta_mca_addr {