Commit c649ed05 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: enable MGCG and LS for ATHUB 3.0 



Enable ATHUB 3.0 MGCG and LS features.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea26ad7f

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

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ athub_v3_0_update_medium_grain_clock_gating(struct amdgpu_device *adev, 


	def = data = RREG32_SOC15(ATHUB, 0, regATHUB_MISC_CNTL);



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

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

		data |= ATHUB_MISC_CNTL__CG_ENABLE_MASK;

	else

		data &= ~ATHUB_MISC_CNTL__CG_ENABLE_MASK;
@@ -53,8 +53,7 @@ athub_v3_0_update_medium_grain_light_sleep(struct amdgpu_device *adev, 


	def = data = RREG32_SOC15(ATHUB, 0, regATHUB_MISC_CNTL);



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

	    (adev->cg_flags & AMD_CG_SUPPORT_HDP_LS))

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

		data |= ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK;

	else

		data &= ~ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK;

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

+3 −1
Original line number Diff line number Diff line
@@ -533,7 +533,9 @@ static int soc21_common_early_init(void *handle) 
			AMD_CG_SUPPORT_GFX_FGCG |

			AMD_CG_SUPPORT_GFX_PERF_CLK |

			AMD_CG_SUPPORT_VCN_MGCG |

			AMD_CG_SUPPORT_JPEG_MGCG;

			AMD_CG_SUPPORT_JPEG_MGCG |

			AMD_CG_SUPPORT_ATHUB_MGCG |

			AMD_CG_SUPPORT_ATHUB_LS;

		adev->pg_flags = AMD_PG_SUPPORT_VCN |

			AMD_PG_SUPPORT_VCN_DPG |

			AMD_PG_SUPPORT_JPEG |