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

Commit c90766cf authored by Alex Deucher's avatar Alex Deucher
Browse files

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



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

Acked-by: default avatarTom St Denis <tom.stdenis@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e08d53cb

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

+13 −9
Original line number Diff line number Diff line
@@ -1085,7 +1085,11 @@ static int vi_common_early_init(void *handle) 
			AMD_CG_SUPPORT_GFX_CGCG |

			AMD_CG_SUPPORT_GFX_CGLS |

			AMD_CG_SUPPORT_SDMA_MGCG |

			AMD_CG_SUPPORT_SDMA_LS;

			AMD_CG_SUPPORT_SDMA_LS |

			AMD_CG_SUPPORT_BIF_LS |

			AMD_CG_SUPPORT_HDP_MGCG |

			AMD_CG_SUPPORT_HDP_LS |

			AMD_CG_SUPPORT_ROM_MGCG;

		adev->pg_flags = 0;

		adev->external_rev_id = adev->rev_id + 0x3c;

		break;
@@ -1194,7 +1198,7 @@ static void fiji_update_bif_medium_grain_light_sleep(struct amdgpu_device *adev, 


	temp = data = RREG32_PCIE(ixPCIE_CNTL2);



	if (enable)

	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_BIF_LS))

		data |= PCIE_CNTL2__SLV_MEM_LS_EN_MASK |

				PCIE_CNTL2__MST_MEM_LS_EN_MASK |

				PCIE_CNTL2__REPLAY_MEM_LS_EN_MASK;
@@ -1214,7 +1218,7 @@ static void fiji_update_hdp_medium_grain_clock_gating(struct amdgpu_device *adev 


	temp = data = RREG32(mmHDP_HOST_PATH_CNTL);



	if (enable)

	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_HDP_MGCG))

		data &= ~HDP_HOST_PATH_CNTL__CLOCK_GATING_DIS_MASK;

	else

		data |= HDP_HOST_PATH_CNTL__CLOCK_GATING_DIS_MASK;
@@ -1230,7 +1234,7 @@ static void fiji_update_hdp_light_sleep(struct amdgpu_device *adev, 


	temp = data = RREG32(mmHDP_MEM_POWER_LS);



	if (enable)

	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_HDP_LS))

		data |= HDP_MEM_POWER_LS__LS_ENABLE_MASK;

	else

		data &= ~HDP_MEM_POWER_LS__LS_ENABLE_MASK;
@@ -1246,7 +1250,7 @@ static void fiji_update_rom_medium_grain_clock_gating(struct amdgpu_device *adev 


	temp = data = RREG32_SMC(ixCGTT_ROM_CLK_CTRL0);



	if (enable)

	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_ROM_MGCG))

		data &= ~(CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE0_MASK |

				CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE1_MASK);

	else