drm/amdgpu: Add channel_dis_num to ras init flags

Add disabled channel number 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 a96f2e369d1ae190b61ad46d1b2b2ad9d9f97618..395e17565d59446c13906a4cbe87e0645062aab2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1677,6 +1677,7 @@ int psp_ras_initialize(struct psp_context *psp)
                ras_cmd->ras_in_message.init_flags.dgpu_mode = 1;
        ras_cmd->ras_in_message.init_flags.xcc_mask =
                adev->gfx.xcc_mask;
+       ras_cmd->ras_in_message.init_flags.channel_dis_num = hweight32(adev->gmc.m_half_use) * 2;
 
        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 be2984ac00a56d758a2dda5556f86b5620573fdd..879bb7af297c7bda447b199a2165a03b4c691562 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
@@ -130,6 +130,7 @@ struct ta_ras_init_flags {
        uint8_t poison_mode_en;
        uint8_t dgpu_mode;
        uint16_t xcc_mask;
+       uint8_t channel_dis_num;
 };
 
 struct ta_ras_output_flags {