[PATCH 11/40] drm/amdgpu: correct CG_ACLK_CNTL setting

[Evan Quan]

Correct polaris CG_ACLK_CNTL setting.

Change-Id: I7d384ce65d598ae33325c09c571bdc7865c36fdc
Signed-off-by: Evan Quan <evan.q...@amd.com>
Acked-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index d5843e8a6e17..8a06c897f27e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -729,8 +729,13 @@ static void gfx_v8_0_get_cu_info(struct amdgpu_device 
*adev);
 static void gfx_v8_0_ring_emit_ce_meta(struct amdgpu_ring *ring);
 static void gfx_v8_0_ring_emit_de_meta(struct amdgpu_ring *ring);
 
+#define CG_ACLK_CNTL__ACLK_DIVIDER_MASK                    0x0000007fL
+#define CG_ACLK_CNTL__ACLK_DIVIDER__SHIFT                  0x00000000L
+
 static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev)
 {
+       uint32_t data;
+
        switch (adev->asic_type) {
        case CHIP_TOPAZ:
                amdgpu_device_program_register_sequence(adev,
@@ -790,11 +795,14 @@ static void gfx_v8_0_init_golden_registers(struct 
amdgpu_device *adev)
                amdgpu_device_program_register_sequence(adev,
                                                        
polaris10_golden_common_all,
                                                        
ARRAY_SIZE(polaris10_golden_common_all));
-               WREG32_SMC(ixCG_ACLK_CNTL, 0x0000001C);
-               if (adev->pdev->revision == 0xc7 &&
+               data = RREG32_SMC(ixCG_ACLK_CNTL);
+               data &= ~CG_ACLK_CNTL__ACLK_DIVIDER_MASK;
+               data |= 0x18 << CG_ACLK_CNTL__ACLK_DIVIDER__SHIFT;
+               WREG32_SMC(ixCG_ACLK_CNTL, data);
+               if ((adev->pdev->device == 0x67DF) && (adev->pdev->revision == 
0xc7) &&
                    ((adev->pdev->subsystem_device == 0xb37 && 
adev->pdev->subsystem_vendor == 0x1002) ||
                     (adev->pdev->subsystem_device == 0x4a8 && 
adev->pdev->subsystem_vendor == 0x1043) ||
-                    (adev->pdev->subsystem_device == 0x9480 && 
adev->pdev->subsystem_vendor == 0x1682))) {
+                    (adev->pdev->subsystem_device == 0x9480 && 
adev->pdev->subsystem_vendor == 0x1680))) {
                        amdgpu_atombios_i2c_channel_trans(adev, 0x10, 0x96, 
0x1E, 0xDD);
                        amdgpu_atombios_i2c_channel_trans(adev, 0x10, 0x96, 
0x1F, 0xD0);
                }
-- 
2.28.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx