diff options
| author |   Lijo Lazar <lijo.lazar@amd.com> | 2022-07-06 13:50:45 +0530 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2023-06-09 09:45:54 -0400 |
| commit | 7aa8a266aaa25e9e2f85d9d2d594cdff6b5635f2 (patch) | |
| tree | 51c0d952a648e491e02ff79157f16bb8a61f5be0 /drivers/gpu | |
| parent | drm/amdgpu: Use instance table for sdma 4.4.2 (diff) | |
| download | wireguard-linux-7aa8a266aaa25e9e2f85d9d2d594cdff6b5635f2.tar.xz wireguard-linux-7aa8a266aaa25e9e2f85d9d2d594cdff6b5635f2.zip | |
drm/amdgpu: Fix GRBM programming sequence
It needs to be done only for XCC instances in non-AID0. Use the physical
instance to determine non-AID0 XCC instances.
Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Le Ma <Le.Ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 e9c12b4970f9..43126f7b70ea 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c @@ -186,11 +186,14 @@ static void gfx_v9_4_3_set_kiq_pm4_funcs(struct amdgpu_device *adev) static void gfx_v9_4_3_init_golden_registers(struct amdgpu_device *adev) { - int i, num_xcc; + int i, num_xcc, dev_inst; num_xcc = NUM_XCC(adev->gfx.xcc_mask); - for (i = 2; i < num_xcc; i++) - WREG32_SOC15(GC, GET_INST(GC, i), regGRBM_MCM_ADDR, 0x4); + for (i = 0; i < num_xcc; i++) { + dev_inst = GET_INST(GC, i); + if (dev_inst >= 2) + WREG32_SOC15(GC, dev_inst, regGRBM_MCM_ADDR, 0x4); + } } static void gfx_v9_4_3_write_data_to_reg(struct amdgpu_ring *ring, int eng_sel, |