p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/amdgpu/gfx: add proper CG flags for fiji 

We were already enabling these CG features, this uses
the standard interface for doing so.

Acked-by: Tom St Denis <tom.stdenis@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2016-04-07 18:38:00 -04:00
parent 4fae91c5e2
commit 14698b6c79
2 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
View File

@ -4282,7 +4282,7 @@ static int gfx_v8_0_set_powergating_state(void *handle,
} }
static void fiji_send_serdes_cmd(struct amdgpu_device *adev, static void fiji_send_serdes_cmd(struct amdgpu_device *adev,
uint32_t reg_addr, uint32_t cmd) uint32_t reg_addr, uint32_t cmd)
{ {
uint32_t data; uint32_t data;
@ -4312,23 +4312,29 @@ static void fiji_send_serdes_cmd(struct amdgpu_device *adev,
} }
static void fiji_update_medium_grain_clock_gating(struct amdgpu_device *adev, static void fiji_update_medium_grain_clock_gating(struct amdgpu_device *adev,
bool enable) bool enable)
{ {
uint32_t temp, data; uint32_t temp, data;
/* It is disabled by HW by default */ /* It is disabled by HW by default */
if (enable) { if (enable && (adev->cg_flags & AMD_CG_SUPPORT_GFX_MGCG)) {
/* 1 - RLC memory Light sleep */ if (adev->cg_flags & AMD_CG_SUPPORT_GFX_MGLS) {
temp = data = RREG32(mmRLC_MEM_SLP_CNTL); if (adev->cg_flags & AMD_CG_SUPPORT_GFX_RLC_LS) {
data |= RLC_MEM_SLP_CNTL__RLC_MEM_LS_EN_MASK; /* 1 - RLC memory Light sleep */
if (temp != data) temp = data = RREG32(mmRLC_MEM_SLP_CNTL);
WREG32(mmRLC_MEM_SLP_CNTL, data); data |= RLC_MEM_SLP_CNTL__RLC_MEM_LS_EN_MASK;
if (temp != data)
WREG32(mmRLC_MEM_SLP_CNTL, data);
}
/* 2 - CP memory Light sleep */ if (adev->cg_flags & AMD_CG_SUPPORT_GFX_CP_LS) {
temp = data = RREG32(mmCP_MEM_SLP_CNTL); /* 2 - CP memory Light sleep */
data |= CP_MEM_SLP_CNTL__CP_MEM_LS_EN_MASK; temp = data = RREG32(mmCP_MEM_SLP_CNTL);
if (temp != data) data |= CP_MEM_SLP_CNTL__CP_MEM_LS_EN_MASK;
WREG32(mmCP_MEM_SLP_CNTL, data); if (temp != data)
WREG32(mmCP_MEM_SLP_CNTL, data);
}
}
/* 3 - RLC_CGTT_MGCG_OVERRIDE */ /* 3 - RLC_CGTT_MGCG_OVERRIDE */
temp = data = RREG32(mmRLC_CGTT_MGCG_OVERRIDE); temp = data = RREG32(mmRLC_CGTT_MGCG_OVERRIDE);
@ -4346,17 +4352,21 @@ static void fiji_update_medium_grain_clock_gating(struct amdgpu_device *adev,
/* 5 - clear mgcg override */ /* 5 - clear mgcg override */
fiji_send_serdes_cmd(adev, BPM_REG_MGCG_OVERRIDE, CLE_BPM_SERDES_CMD); fiji_send_serdes_cmd(adev, BPM_REG_MGCG_OVERRIDE, CLE_BPM_SERDES_CMD);
/* 6 - Enable CGTS(Tree Shade) MGCG /MGLS */ if (adev->cg_flags & AMD_CG_SUPPORT_GFX_CGTS) {
temp = data = RREG32(mmCGTS_SM_CTRL_REG); /* 6 - Enable CGTS(Tree Shade) MGCG /MGLS */
data &= ~(CGTS_SM_CTRL_REG__SM_MODE_MASK); temp = data = RREG32(mmCGTS_SM_CTRL_REG);
data |= (0x2 << CGTS_SM_CTRL_REG__SM_MODE__SHIFT); data &= ~(CGTS_SM_CTRL_REG__SM_MODE_MASK);
data |= CGTS_SM_CTRL_REG__SM_MODE_ENABLE_MASK; data |= (0x2 << CGTS_SM_CTRL_REG__SM_MODE__SHIFT);
data &= ~CGTS_SM_CTRL_REG__OVERRIDE_MASK; data |= CGTS_SM_CTRL_REG__SM_MODE_ENABLE_MASK;
data &= ~CGTS_SM_CTRL_REG__LS_OVERRIDE_MASK; data &= ~CGTS_SM_CTRL_REG__OVERRIDE_MASK;
data |= CGTS_SM_CTRL_REG__ON_MONITOR_ADD_EN_MASK; if ((adev->cg_flags & AMD_CG_SUPPORT_GFX_MGLS) &&
data |= (0x96 << CGTS_SM_CTRL_REG__ON_MONITOR_ADD__SHIFT); (adev->cg_flags & AMD_CG_SUPPORT_GFX_CGTS_LS))
if (temp != data) data &= ~CGTS_SM_CTRL_REG__LS_OVERRIDE_MASK;
WREG32(mmCGTS_SM_CTRL_REG, data); data |= CGTS_SM_CTRL_REG__ON_MONITOR_ADD_EN_MASK;
data |= (0x96 << CGTS_SM_CTRL_REG__ON_MONITOR_ADD__SHIFT);
if (temp != data)
WREG32(mmCGTS_SM_CTRL_REG, data);
}
udelay(50); udelay(50);
/* 7 - wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */ /* 7 - wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */
@ -4406,13 +4416,13 @@ static void fiji_update_medium_grain_clock_gating(struct amdgpu_device *adev,
} }
static void fiji_update_coarse_grain_clock_gating(struct amdgpu_device *adev, static void fiji_update_coarse_grain_clock_gating(struct amdgpu_device *adev,
bool enable) bool enable)
{ {
uint32_t temp, temp1, data, data1; uint32_t temp, temp1, data, data1;
temp = data = RREG32(mmRLC_CGCG_CGLS_CTRL); temp = data = RREG32(mmRLC_CGCG_CGLS_CTRL);
if (enable) { if (enable && (adev->cg_flags & AMD_CG_SUPPORT_GFX_CGCG)) {
/* 1 enable cntx_empty_int_enable/cntx_busy_int_enable/ /* 1 enable cntx_empty_int_enable/cntx_busy_int_enable/
* Cmp_busy/GFX_Idle interrupts * Cmp_busy/GFX_Idle interrupts
*/ */
@ -4438,14 +4448,18 @@ static void fiji_update_coarse_grain_clock_gating(struct amdgpu_device *adev,
/* 5 - enable cgcg */ /* 5 - enable cgcg */
data |= RLC_CGCG_CGLS_CTRL__CGCG_EN_MASK; data |= RLC_CGCG_CGLS_CTRL__CGCG_EN_MASK;
/* enable cgls*/ if (adev->cg_flags & AMD_CG_SUPPORT_GFX_CGLS) {
data |= RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK; /* enable cgls*/
data |= RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK;
temp1 = data1 = RREG32(mmRLC_CGTT_MGCG_OVERRIDE); temp1 = data1 = RREG32(mmRLC_CGTT_MGCG_OVERRIDE);
data1 &= ~RLC_CGTT_MGCG_OVERRIDE__CGLS_MASK; data1 &= ~RLC_CGTT_MGCG_OVERRIDE__CGLS_MASK;
if (temp1 != data1) if (temp1 != data1)
WREG32(mmRLC_CGTT_MGCG_OVERRIDE, data1); WREG32(mmRLC_CGTT_MGCG_OVERRIDE, data1);
} else {
data &= ~RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK;
}
if (temp != data) if (temp != data)
WREG32(mmRLC_CGCG_CGLS_CTRL, data); WREG32(mmRLC_CGCG_CGLS_CTRL, data);
@ -4480,13 +4494,13 @@ static void fiji_update_coarse_grain_clock_gating(struct amdgpu_device *adev,
/* disable cgcg, cgls should be disabled too. */ /* disable cgcg, cgls should be disabled too. */
data &= ~(RLC_CGCG_CGLS_CTRL__CGCG_EN_MASK | data &= ~(RLC_CGCG_CGLS_CTRL__CGCG_EN_MASK |
RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK); RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK);
if (temp != data) if (temp != data)
WREG32(mmRLC_CGCG_CGLS_CTRL, data); WREG32(mmRLC_CGCG_CGLS_CTRL, data);
} }
} }
static int fiji_update_gfx_clock_gating(struct amdgpu_device *adev, static int fiji_update_gfx_clock_gating(struct amdgpu_device *adev,
bool enable) bool enable)
{ {
if (enable) { if (enable) {
/* CGCG/CGLS should be enabled after MGCG/MGLS/TS(CG/LS) /* CGCG/CGLS should be enabled after MGCG/MGLS/TS(CG/LS)

9
drivers/gpu/drm/amd/amdgpu/vi.c
View File

@ -1076,7 +1076,14 @@ static int vi_common_early_init(void *handle)
adev->external_rev_id = 0x1; adev->external_rev_id = 0x1;
break; break;
case CHIP_FIJI: case CHIP_FIJI:
adev->cg_flags = 0; adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |
AMD_CG_SUPPORT_GFX_MGLS |
AMD_CG_SUPPORT_GFX_RLC_LS |
AMD_CG_SUPPORT_GFX_CP_LS |
AMD_CG_SUPPORT_GFX_CGTS |
AMD_CG_SUPPORT_GFX_CGTS_LS |
AMD_CG_SUPPORT_GFX_CGCG |
AMD_CG_SUPPORT_GFX_CGLS;
adev->pg_flags = 0; adev->pg_flags = 0;
adev->external_rev_id = adev->rev_id + 0x3c; adev->external_rev_id = adev->rev_id + 0x3c;
break; break;