drm/amd/gfx6: update gb_addr_config

Signed-off-by: Flora Cui <Flora.Cui@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_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index e7c886ece797b97bfa09b2f05e3b0b8e073fe3f8..2086e7e68de447630bf099e1722805fbe585c06c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -1710,6 +1710,9 @@ static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)
                gb_addr_config |= 2 << GB_ADDR_CONFIG__ROW_SIZE__SHIFT;
                break;
        }
+       gb_addr_config &= ~GB_ADDR_CONFIG__NUM_SHADER_ENGINES_MASK;
+       if (adev->gfx.config.max_shader_engines == 2)
+               gb_addr_config |= 1 << GB_ADDR_CONFIG__NUM_SHADER_ENGINES__SHIFT;
        adev->gfx.config.gb_addr_config = gb_addr_config;
 
        WREG32(mmGB_ADDR_CONFIG, gb_addr_config);