Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fde56b8 authored Apr 08, 2016 by Alex Deucher

drm/amdgpu/gmc: 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>

parent c90766cf

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1314,7 +1314,7 @@ static void fiji_update_mc_medium_grain_clock_gating(struct amdgpu_device *adev,
		{
		uint32_t data;

		if (enable) {
		if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) {
		data = RREG32(mmMC_HUB_MISC_HUB_CG);
		data \|= MC_HUB_MISC_HUB_CG__ENABLE_MASK;
		WREG32(mmMC_HUB_MISC_HUB_CG, data);
		@@ -1394,7 +1394,7 @@ static void fiji_update_mc_light_sleep(struct amdgpu_device *adev,
		{
		uint32_t data;

		if (enable) {
		if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
		data = RREG32(mmMC_HUB_MISC_HUB_CG);
		data \|= MC_HUB_MISC_HUB_CG__MEM_LS_ENABLE_MASK;
		WREG32(mmMC_HUB_MISC_HUB_CG, data);

drivers/gpu/drm/amd/amdgpu/vi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1089,7 +1089,9 @@ static int vi_common_early_init(void *handle)
		AMD_CG_SUPPORT_BIF_LS \|
		AMD_CG_SUPPORT_HDP_MGCG \|
		AMD_CG_SUPPORT_HDP_LS \|
		AMD_CG_SUPPORT_ROM_MGCG;
		AMD_CG_SUPPORT_ROM_MGCG \|
		AMD_CG_SUPPORT_MC_MGCG \|
		AMD_CG_SUPPORT_MC_LS;
		adev->pg_flags = 0;
		adev->external_rev_id = adev->rev_id + 0x3c;
		break;