drm/amdgpu: Add some XCC programming

Add additional XCC programming sequences.

Signed-off-by: Lijo Lazar <lijo.lazar@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/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index ce64c4fc5f1ae89df2c3449a1c8510ac8b6fa7eb..232feb387a4082c1a184325305aa37eef9077699 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -1150,6 +1150,29 @@ static void gfx_v9_4_3_disable_gpa_mode(struct amdgpu_device *adev, int xcc_id)
        WREG32_SOC15(GC, xcc_id, regCPC_PSP_DEBUG, data);
 }
 
+static void gfx_v9_4_3_program_xcc_id(struct amdgpu_device *adev, int xcc_id)
+{
+       uint32_t tmp = 0;
+
+       switch (adev->gfx.num_xcd) {
+       /* directly config VIRTUAL_XCC_ID to 0 for 1-XCC */
+       case 1:
+               WREG32_SOC15(GC, xcc_id, regCP_HYP_XCP_CTL, 0x8);
+               break;
+       case 2:
+               tmp = (xcc_id % adev->gfx.num_xcc_per_xcp) << REG_FIELD_SHIFT(CP_HYP_XCP_CTL, VIRTUAL_XCC_ID);
+               tmp = tmp | (adev->gfx.num_xcd << REG_FIELD_SHIFT(CP_HYP_XCP_CTL, NUM_XCC_IN_XCP));
+               WREG32_SOC15(GC, xcc_id, regCP_HYP_XCP_CTL, tmp);
+
+               tmp = xcc_id << REG_FIELD_SHIFT(CP_PSP_XCP_CTL, PHYSICAL_XCC_ID);
+               tmp = tmp | (xcc_id << REG_FIELD_SHIFT(CP_PSP_XCP_CTL, XCC_DIE_ID));
+               WREG32_SOC15(GC, xcc_id, regCP_PSP_XCP_CTL, tmp);
+               break;
+       default:
+               break;
+       }
+}
+
 static bool gfx_v9_4_3_is_rlc_enabled(struct amdgpu_device *adev)
 {
        uint32_t rlc_setting;
@@ -1948,6 +1971,9 @@ static int gfx_v9_4_3_cp_resume(struct amdgpu_device *adev)
                                return r;
                }
 
+               /* set the virtual and physical id based on partition_mode */
+               gfx_v9_4_3_program_xcc_id(adev, i);
+
                r = gfx_v9_4_3_kiq_resume(adev, i);
                if (r)
                        return r;