Skip to contentSkip to conversation

drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3

PATCH In review Aaron Liu 2 participants 4 messages Jan 20, 2021

Subsystems (2)
lore
Share & tools
lore

Aaron Liu

author
#0 lore raw

PATCH 1/1 drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3

Starting from vangogh, the ATCL2 and DAGB0 registers relative to mgcg/ls has changed.

For MGCG:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL.

For MGLS:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL. Add DAGB0_(WR/RD)_CGTT_CLK_CTRL registers.

---
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 84 ++++++++++++++++++-------
 1 file changed, 61 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +61 -23
index 92f02883daa3..8f2edba5bc9e 100644
@@ -492,12 +492,11 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,
 {
 	uint32_t def, data, def1, data1;
 
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
+	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL);
 	def1 = data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) {
-		data |= MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data &= ~MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;
 		data1 &= ~(DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 		           DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		           DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -506,8 +505,7 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,
 		           DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK);
 
 	} else {
-		data &= ~MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data |= MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;
 		data1 |= (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -517,7 +515,7 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,
 	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL, data);
 	if (def1 != data1)
 		WREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2, data1);
 }
@@ -526,17 +524,44 @@ static void
 mmhub_v2_3_update_medium_grain_light_sleep(struct amdgpu_device *adev,
 					   bool enable)
 {
-	uint32_t def, data;
-
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-
-	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS))
-		data |= MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
-	else
-		data &= ~MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
+	uint32_t def, data, def1, data1, def2, data2;
+
+	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL);
+	def1 = data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL);
+	def2 = data2 = RREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL);
+
+	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
+		data &= ~MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;
+		data1 &= !(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+		data2 &= !(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+	} else {
+		data |= MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;
+		data1 |= (DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+		data2 |= (DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL, data);
+	if (def1 != data1)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL, data1);
+	if (def2 != data2)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL, data2);
 }
 
 static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,
@@ -555,26 +580,39 @@ static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,
 
 static void mmhub_v2_3_get_clockgating(struct amdgpu_device *adev, u32 *flags)
 {
-	int data, data1;
+	int data, data1, data2, data3;
 
 	if (amdgpu_sriov_vf(adev))
 		*flags = 0;
 
-	data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-	data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data1  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL);
+	data2 = RREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL);
+	data3 = RREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL);
 
 	/* AMD_CG_SUPPORT_MC_MGCG */
-	if ((data & MM_ATC_L2_MISC_CG__ENABLE_MASK) &&
-	    !(data1 & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
+	if (!(data & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_TLBWR_CG_MASK |
-		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK)))
-		*flags |= AMD_CG_SUPPORT_MC_MGCG;
+		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK))
+		&& !(data1 & MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK)) {
+			*flags |= AMD_CG_SUPPORT_MC_MGCG;
+	}
 
 	/* AMD_CG_SUPPORT_MC_LS */
-	if (data & MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK)
+	if (!(data1 & MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK)
+		&& !(data2 & (DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK))
+		&& !(data3 & (DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK)))
 		*flags |= AMD_CG_SUPPORT_MC_LS;
 }
 
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Aaron

Starting from vangogh, the ATCL2 and DAGB0 registers relative to mgcg/ls has changed.

For MGCG:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL.

For MGLS:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL. Add DAGB0_(WR/RD)_CGTT_CLK_CTRL registers.

Could you double verify it on vangogh as well?

After that, patch is

Quoted 147 lines
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 84 ++++++++++++++++++-------
 1 file changed, 61 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +61 -23
index 92f02883daa3..8f2edba5bc9e 100644
@@ -492,12 +492,11 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,
 {
 	uint32_t def, data, def1, data1;
 
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
+	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL);
 	def1 = data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) {
-		data |= MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data &= ~MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;
 		data1 &= ~(DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 		           DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		           DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -506,8 +505,7 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,
 		           DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK);
 
 	} else {
-		data &= ~MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data |= MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;
 		data1 |= (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -517,7 +515,7 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,
 	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL, data);
 	if (def1 != data1)
 		WREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2, data1);
 }
@@ -526,17 +524,44 @@ static void
 mmhub_v2_3_update_medium_grain_light_sleep(struct amdgpu_device *adev,
 					   bool enable)
 {
-	uint32_t def, data;
-
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-
-	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS))
-		data |= MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
-	else
-		data &= ~MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
+	uint32_t def, data, def1, data1, def2, data2;
+
+	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL);
+	def1 = data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL);
+	def2 = data2 = RREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL);
+
+	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
+		data &= ~MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;
+		data1 &= !(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+		data2 &= !(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+	} else {
+		data |= MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;
+		data1 |= (DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+		data2 |= (DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+			DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);
+	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL, data);
+	if (def1 != data1)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL, data1);
+	if (def2 != data2)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL, data2);
 }
 
 static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,
@@ -555,26 +580,39 @@ static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,
 
 static void mmhub_v2_3_get_clockgating(struct amdgpu_device *adev, u32 *flags)
 {
-	int data, data1;
+	int data, data1, data2, data3;
 
 	if (amdgpu_sriov_vf(adev))
 		*flags = 0;
 
-	data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-	data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data1  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_CGTT_CLK_CTRL);
+	data2 = RREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL);
+	data3 = RREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL);
 
 	/* AMD_CG_SUPPORT_MC_MGCG */
-	if ((data & MM_ATC_L2_MISC_CG__ENABLE_MASK) &&
-	    !(data1 & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
+	if (!(data & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_TLBWR_CG_MASK |
-		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK)))
-		*flags |= AMD_CG_SUPPORT_MC_MGCG;
+		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK))
+		&& !(data1 & MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK)) {
+			*flags |= AMD_CG_SUPPORT_MC_MGCG;
+	}
 
 	/* AMD_CG_SUPPORT_MC_LS */
-	if (data & MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK)
+	if (!(data1 & MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK)
+		&& !(data2 & (DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+				DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK))
+		&& !(data3 & (DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |
+				DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK)))
 		*flags |= AMD_CG_SUPPORT_MC_LS;
 }
 
Signature · 1 line
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#2 lore raw

[AMD Official Use Only - Internal Distribution Only]

This patch has been Verfied on Van Gogh.

--
Best Regards
Aaron Liu

Quoted 214 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Wednesday, January 20, 2021 10:06 AM
To: Liu, Aaron <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3

Quoted 11 lines · Aaron

Starting from vangogh, the ATCL2 and DAGB0 registers relative to mgcg/ls has changed.

For MGCG:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL.

For MGLS:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL. Add DAGB0_(WR/RD)_CGTT_CLK_CTRL registers.

Could you double verify it on vangogh as well?

After that, patch is

Quoted 11 lines
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 84
++++++++++++++++++-------
 1 file changed, 61 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
index 92f02883daa3..8f2edba5bc9e 100644
@@ -492,12 +492,11 @@
Quoted 1 line

mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device

*adev, {

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -1
 	uint32_t def, data, def1, data1;
 
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
+	def  = data  = RREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL);

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -2
 	def1 = data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) {
-		data |= MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data &=

~MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;

Quoted 1 line

data1 &=

~(DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
 		           DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		           DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |

@@ -506,8

Quoted 1 line

+505,7 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct

amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -2
 		           DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK);
 
 	} else {
-		data &= ~MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data |=

MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
 		data1 |= (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
(quoted diff) +0 -0
@@ -517,7 +515,7 @@
Quoted 1 line

mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device

*adev,

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -1
 	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL, data);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
 	if (def1 != data1)
 		WREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2,

data1); } @@ -526,17

Quoted 2 lines

+524,44 @@ static void mmhub_v2_3_update_medium_grain_light_sleep(struct amdgpu_device

*adev,

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static void

Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -8
 					   bool enable)
 {
-	uint32_t def, data;
-
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-
-	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS))
-		data |= MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
-	else
-		data &= ~MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
+	uint32_t def, data, def1, data1, def2, data2;
+
+	def  = data  = RREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL);

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+	def1 = data1 = RREG32_SOC15(MMHUB, 0,

mmDAGB0_WR_CGTT_CLK_CTRL);

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+	def2 = data2 = RREG32_SOC15(MMHUB, 0,

mmDAGB0_RD_CGTT_CLK_CTRL);

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static void

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -0
+
+	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
+		data &=

~MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		data1

&= !(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		data2 &= !(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK

|

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+	} else {
+		data |=

MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		data1 |= (DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK

|

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+		data2 |= (DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static void

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -1
+	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL, data);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+	if (def1 != data1)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL,

data1);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+	if (def2 != data2)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL,

data2);

Quoted 8 lines

}

static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev, @@
-555,26 +580,39 @@ static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

static void mmhub_v2_3_get_clockgating(struct amdgpu_device *adev,
u32 *flags) {

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -3
-	int data, data1;
+	int data, data1, data2, data3;
 
 	if (amdgpu_sriov_vf(adev))
 		*flags = 0;
 
-	data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-	data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data1  = RREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL);

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -1
+	data2 = RREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL);
+	data3 = RREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL);
 
 	/* AMD_CG_SUPPORT_MC_MGCG */
-	if ((data & MM_ATC_L2_MISC_CG__ENABLE_MASK) &&

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -3
-	    !(data1 & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
+	if (!(data & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_TLBWR_CG_MASK |
-		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK)))
-		*flags |= AMD_CG_SUPPORT_MC_MGCG;
+		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK))
+		&& !(data1 &

MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK)) {

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +4 -1
+			*flags |= AMD_CG_SUPPORT_MC_MGCG;
+	}
 
 	/* AMD_CG_SUPPORT_MC_LS */
-	if (data & MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK)
+	if (!(data1 & MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK)
+		&& !(data2 &

(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK))

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		&& !(data3 &

(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |

Quoted 14 lines
Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK)))

Quoted 6 lines

*flags |= AMD_CG_SUPPORT_MC_LS;
}

--
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by
#3 lore raw
Quoted 4 lines · Aaron

[AMD Official Use Only - Internal Distribution Only]

This patch has been Verfied on Van Gogh.

Thanks.

Quoted 232 lines

--
Best Regards
Aaron Liu

Quoted 228 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Wednesday, January 20, 2021 10:06 AM
To: Liu, Aaron <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3

Quoted 11 lines · Aaron

Starting from vangogh, the ATCL2 and DAGB0 registers relative to mgcg/ls has changed.

For MGCG:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL.

For MGLS:
Replace mmMM_ATC_L2_MISC_CG with mmMM_ATC_L2_CGTT_CLK_CTRL. Add DAGB0_(WR/RD)_CGTT_CLK_CTRL registers.

Could you double verify it on vangogh as well?

After that, patch is

Quoted 11 lines
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 84
++++++++++++++++++-------
 1 file changed, 61 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
index 92f02883daa3..8f2edba5bc9e 100644
@@ -492,12 +492,11 @@
Quoted 1 line

mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device

*adev, {

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -1
 	uint32_t def, data, def1, data1;
 
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
+	def  = data  = RREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL);

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -2
 	def1 = data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_MGCG)) {
-		data |= MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data &=

~MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;

Quoted 1 line

data1 &=

~(DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
 		           DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		           DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |

@@ -506,8

Quoted 1 line

+505,7 @@ mmhub_v2_3_update_medium_grain_clock_gating(struct

amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -2
 		           DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK);
 
 	} else {
-		data &= ~MM_ATC_L2_MISC_CG__ENABLE_MASK;
-
+		data |=

MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK;

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
 		data1 |= (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 			  DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
(quoted diff) +0 -0
@@ -517,7 +515,7 @@
Quoted 1 line

mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device

*adev,

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c mmhub_v2_3_update_medium_grain_clock_gating(struct amdgpu_device *adev,

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -1
 	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL, data);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +0 -0
 	if (def1 != data1)
 		WREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2,

data1); } @@ -526,17

Quoted 2 lines

+524,44 @@ static void mmhub_v2_3_update_medium_grain_light_sleep(struct amdgpu_device

*adev,

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static void

Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -8
 					   bool enable)
 {
-	uint32_t def, data;
-
-	def  = data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-
-	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS))
-		data |= MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
-	else
-		data &= ~MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK;
+	uint32_t def, data, def1, data1, def2, data2;
+
+	def  = data  = RREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL);

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+	def1 = data1 = RREG32_SOC15(MMHUB, 0,

mmDAGB0_WR_CGTT_CLK_CTRL);

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+	def2 = data2 = RREG32_SOC15(MMHUB, 0,

mmDAGB0_RD_CGTT_CLK_CTRL);

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static void

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -0
+
+	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_MC_LS)) {
+		data &=

~MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		data1

&= !(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		data2 &= !(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK

|

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+	} else {
+		data |=

MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK;

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		data1 |= (DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK

|

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+		data2 |= (DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |
+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

	DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK);

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static void

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -1
+	}
 
 	if (def != data)
-		WREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG, data);
+		WREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL, data);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+	if (def1 != data1)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL,

data1);

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

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -0
+	if (def2 != data2)
+		WREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL,

data2);

Quoted 8 lines

}

static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev, @@
-555,26 +580,39 @@ static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

static void mmhub_v2_3_get_clockgating(struct amdgpu_device *adev,
u32 *flags) {

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -3
-	int data, data1;
+	int data, data1, data2, data3;
 
 	if (amdgpu_sriov_vf(adev))
 		*flags = 0;
 
-	data  = RREG32_SOC15(MMHUB, 0, mmMM_ATC_L2_MISC_CG);
-	data1 = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data = RREG32_SOC15(MMHUB, 0, mmDAGB0_CNTL_MISC2);
+	data1  = RREG32_SOC15(MMHUB, 0,

mmMM_ATC_L2_CGTT_CLK_CTRL);

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +2 -1
+	data2 = RREG32_SOC15(MMHUB, 0, mmDAGB0_WR_CGTT_CLK_CTRL);
+	data3 = RREG32_SOC15(MMHUB, 0, mmDAGB0_RD_CGTT_CLK_CTRL);
 
 	/* AMD_CG_SUPPORT_MC_MGCG */
-	if ((data & MM_ATC_L2_MISC_CG__ENABLE_MASK) &&

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +3 -3
-	    !(data1 & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
+	if (!(data & (DAGB0_CNTL_MISC2__DISABLE_WRREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_WRRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_RDRET_CG_MASK |
 		       DAGB0_CNTL_MISC2__DISABLE_TLBWR_CG_MASK |
-		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK)))
-		*flags |= AMD_CG_SUPPORT_MC_MGCG;
+		       DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK))
+		&& !(data1 &

MM_ATC_L2_CGTT_CLK_CTRL__SOFT_OVERRIDE_MASK)) {

drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c static int mmhub_v2_3_set_clockgating(struct amdgpu_device *adev,

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +4 -1
+			*flags |= AMD_CG_SUPPORT_MC_MGCG;
+	}
 
 	/* AMD_CG_SUPPORT_MC_LS */
-	if (data & MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK)
+	if (!(data1 & MM_ATC_L2_CGTT_CLK_CTRL__MGLS_OVERRIDE_MASK)
+		&& !(data2 &

(DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

DAGB0_WR_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK))

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

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +1 -0
+		&& !(data3 &

(DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_WRITE_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_READ_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_RETURN_MASK |

Quoted 1 line

+

DAGB0_RD_CGTT_CLK_CTRL__LS_OVERRIDE_REGISTER_MASK)))

Quoted 6 lines

*flags |= AMD_CG_SUPPORT_MC_LS;
}

--
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx