drm/amdgpu: Add active_umc_mask to ras init_flags

Add active_umc_mask to ras init_flags.

Signed-off-by: Candice Li <candice.li@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 0f2eb69ad715bfb8ad2a4ea7a172146981332b7d..a390ec0b6370ea9bb7216b1022c5c3cf4febf145 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1861,6 +1861,7 @@ int psp_ras_initialize(struct psp_context *psp)
        if (adev->gmc.gmc_funcs->query_mem_partition_mode)
                ras_cmd->ras_in_message.init_flags.nps_mode =
                        adev->gmc.gmc_funcs->query_mem_partition_mode(adev);
+       ras_cmd->ras_in_message.init_flags.active_umc_mask = adev->umc.active_mask;
 
        ret = psp_ta_load(psp, &psp->ras_context.context);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
index 64891f0993666e62b26aa95f5412ffc217ba45c6..a3b5fda224328bfbf28999a19c0322bff9e4d860 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
@@ -151,6 +151,7 @@ struct ta_ras_init_flags {
        uint16_t xcc_mask;
        uint8_t channel_dis_num;
        uint8_t nps_mode;
+       uint32_t active_umc_mask;
 };
 
 struct ta_ras_mca_addr {