Commit 2d955a06 authored by Mangesh Gadre's avatar Mangesh Gadre Committed by Alex Deucher

Revert "drm/amdgpu: Program xcp_ctl registers as needed"

This reverts commit 0bdebfef.

XCP_CTL register is programmed by firmware and
register access is protected.
Signed-off-by: default avatarMangesh Gadre <Mangesh.Gadre@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ab29ac57
...@@ -623,7 +623,7 @@ static int gfx_v9_4_3_switch_compute_partition(struct amdgpu_device *adev, ...@@ -623,7 +623,7 @@ static int gfx_v9_4_3_switch_compute_partition(struct amdgpu_device *adev,
int num_xccs_per_xcp) int num_xccs_per_xcp)
{ {
int ret, i, num_xcc; int ret, i, num_xcc;
u32 tmp = 0, regval; u32 tmp = 0;
if (adev->psp.funcs) { if (adev->psp.funcs) {
ret = psp_spatial_partition(&adev->psp, ret = psp_spatial_partition(&adev->psp,
...@@ -631,8 +631,7 @@ static int gfx_v9_4_3_switch_compute_partition(struct amdgpu_device *adev, ...@@ -631,8 +631,7 @@ static int gfx_v9_4_3_switch_compute_partition(struct amdgpu_device *adev,
num_xccs_per_xcp); num_xccs_per_xcp);
if (ret) if (ret)
return ret; return ret;
} } else {
num_xcc = NUM_XCC(adev->gfx.xcc_mask); num_xcc = NUM_XCC(adev->gfx.xcc_mask);
for (i = 0; i < num_xcc; i++) { for (i = 0; i < num_xcc; i++) {
...@@ -640,15 +639,15 @@ static int gfx_v9_4_3_switch_compute_partition(struct amdgpu_device *adev, ...@@ -640,15 +639,15 @@ static int gfx_v9_4_3_switch_compute_partition(struct amdgpu_device *adev,
num_xccs_per_xcp); num_xccs_per_xcp);
tmp = REG_SET_FIELD(tmp, CP_HYP_XCP_CTL, VIRTUAL_XCC_ID, tmp = REG_SET_FIELD(tmp, CP_HYP_XCP_CTL, VIRTUAL_XCC_ID,
i % num_xccs_per_xcp); i % num_xccs_per_xcp);
regval = RREG32_SOC15(GC, GET_INST(GC, i), regCP_HYP_XCP_CTL);
if (regval != tmp)
WREG32_SOC15(GC, GET_INST(GC, i), regCP_HYP_XCP_CTL, WREG32_SOC15(GC, GET_INST(GC, i), regCP_HYP_XCP_CTL,
tmp); tmp);
} }
ret = 0;
}
adev->gfx.num_xcc_per_xcp = num_xccs_per_xcp; adev->gfx.num_xcc_per_xcp = num_xccs_per_xcp;
return 0; return ret;
} }
static int gfx_v9_4_3_ih_to_xcc_inst(struct amdgpu_device *adev, int ih_node) static int gfx_v9_4_3_ih_to_xcc_inst(struct amdgpu_device *adev, int ih_node)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment