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>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 02deb322940565baa6d1d3e3f648fe7cf152e6aa..1e85b8fc60a5be5411dbd8ec349aab11a9ad1b8f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -1310,11 +1310,11 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,
 }
 
 static void fiji_update_mc_medium_grain_clock_gating(struct amdgpu_device *adev,
-               bool enable)
+                                                    bool enable)
 {
        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);
@@ -1390,11 +1390,11 @@ static void fiji_update_mc_medium_grain_clock_gating(struct amdgpu_device *adev,
 }
 
 static void fiji_update_mc_light_sleep(struct amdgpu_device *adev,
-               bool enable)
+                                      bool enable)
 {
        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);

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index ea9edf4e32ad54abd185c33048c198afa87d8e72..16b2a299f3a43f1afd7099eb9ccb1ccd8afa3932 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -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;