瀏覽代碼

drm/amdgpu/st: move ATC CG golden init from gfx to mc

It's technically an MC register so make sure we initialize it
in the MC module rather than the gfx module.  Since other bits
in the same register are used to enable ATC CG features make
sure we apply the golden setting first.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Alex Deucher 9 年之前
父節點
當前提交
0711257ee6
共有 2 個文件被更改,包括 1 次插入1 次删除
  1. 0 1
      drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
  2. 1 0
      drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

+ 0 - 1
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

@@ -640,7 +640,6 @@ static const u32 stoney_mgcg_cgcg_init[] =
 	mmCP_MEM_SLP_CNTL, 0xffffffff, 0x00020201,
 	mmCP_MEM_SLP_CNTL, 0xffffffff, 0x00020201,
 	mmRLC_MEM_SLP_CNTL, 0xffffffff, 0x00020201,
 	mmRLC_MEM_SLP_CNTL, 0xffffffff, 0x00020201,
 	mmCGTS_SM_CTRL_REG, 0xffffffff, 0x96940200,
 	mmCGTS_SM_CTRL_REG, 0xffffffff, 0x96940200,
-	mmATC_MISC_CG, 0xffffffff, 0x000c0200,
 };
 };
 
 
 static void gfx_v8_0_set_ring_funcs(struct amdgpu_device *adev);
 static void gfx_v8_0_set_ring_funcs(struct amdgpu_device *adev);

+ 1 - 0
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

@@ -100,6 +100,7 @@ static const u32 cz_mgcg_cgcg_init[] =
 
 
 static const u32 stoney_mgcg_cgcg_init[] =
 static const u32 stoney_mgcg_cgcg_init[] =
 {
 {
+	mmATC_MISC_CG, 0xffffffff, 0x000c0200,
 	mmMC_MEM_POWER_LS, 0xffffffff, 0x00000104
 	mmMC_MEM_POWER_LS, 0xffffffff, 0x00000104
 };
 };