Skip to contentSkip to conversation

drm/amdgpu: add gfx clock gating for Arcturus

PATCH In review Le Ma 2 participants 15 messages Aug 8, 2019 – Aug 9, 2019 7 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Le Ma

author
#0 lore raw

PATCH 1/9 drm/amdgpu: add gfx clock gating for Arcturus

Add ARCTURUS case in gfx set clockgating function. No 3d clock on Arcturus.

Change-Id I9893a2afea7f0b5d433baa14f48ae55a36516fac
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -0
index fdd90c1..de3de1c 100644
@@ -4218,6 +4218,9 @@ static void gfx_v9_0_update_3d_clock_gating(struct amdgpu_device *adev,
 {
 	uint32_t data, def;
 
+	if (adev->asic_type == CHIP_ARCTURUS)
+		return;
+
 	amdgpu_gfx_rlc_enter_safe_mode(adev);
 
 	/* Enable 3D CGCG/CGLS */
@@ -4410,6 +4413,7 @@ static int gfx_v9_0_set_clockgating_state(void *handle,
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_ARCTURUS:
 		gfx_v9_0_update_gfx_clock_gating(adev,
 						 state == AMD_CG_STATE_GATE ? true : false);
 		break;
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-1-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH 2/9 drm/amdgpu: enable gfx clock gating for Arcturus

Init gfx MGCG/LS, CGCG/LS, CP_LS flag.

Change-Id I88db76d1b8f2b2cecce10846a4d22eec638eea8a
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +5 -1
index 15f6356..00758be 100644
@@ -1013,7 +1013,11 @@ static int soc15_common_early_init(void *handle)
 		break;
 	case CHIP_ARCTURUS:
 		adev->asic_funcs = &vega20_asic_funcs;
-		adev->cg_flags = 0;
+		adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |
+			AMD_CG_SUPPORT_GFX_MGLS |
+			AMD_CG_SUPPORT_GFX_CGCG |
+			AMD_CG_SUPPORT_GFX_CGLS |
+			AMD_CG_SUPPORT_GFX_CP_LS;
 		adev->pg_flags = 0;
 		adev->external_rev_id = adev->rev_id + 0x32;
 		break;
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-2-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

Reviewed-by Kenneth Feng
#4 lore raw

RE: [PATCH 2/9] drm/amdgpu: enable gfx clock gating for Arcturus

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 2/9] drm/amdgpu: enable gfx clock gating for Arcturus

[CAUTION: External Email]

Init gfx MGCG/LS, CGCG/LS, CP_LS flag.

Change-Id I88db76d1b8f2b2cecce10846a4d22eec638eea8a
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +5 -1
index 15f6356..00758be 100644
@@ -1013,7 +1013,11 @@ static int soc15_common_early_init(void *handle)
                break;
        case CHIP_ARCTURUS:
                adev->asic_funcs = &vega20_asic_funcs;
-               adev->cg_flags = 0;
+               adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |
+                       AMD_CG_SUPPORT_GFX_MGLS |
+                       AMD_CG_SUPPORT_GFX_CGCG |
+                       AMD_CG_SUPPORT_GFX_CGLS |
+                       AMD_CG_SUPPORT_GFX_CP_LS;
                adev->pg_flags = 0;
                adev->external_rev_id = adev->rev_id + 0x32;
                break;

--
2.7.4

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

author
#5 lore raw

PATCH 3/9 drm/amdgpu: add hdp clock gating for Arcturus

In reply to a message not in the archive

Add hdp CGLS for Arcturus in set common clockgating function

Change-Id I44e392fa5f7653908b36b0902e721d56eed3eb92
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +6 -1
index 00758be..4fbaca3 100644
@@ -1157,7 +1157,8 @@ static void soc15_update_hdp_light_sleep(struct amdgpu_device *adev, bool enable
 {
 	uint32_t def, data;
 
-	if (adev->asic_type == CHIP_VEGA20) {
+	if (adev->asic_type == CHIP_VEGA20 ||
+		adev->asic_type == CHIP_ARCTURUS) {
 		def = data = RREG32(SOC15_REG_OFFSET(HDP, 0, mmHDP_MEM_POWER_CTRL));
 
 		if (enable && (adev->cg_flags & AMD_CG_SUPPORT_HDP_LS))
@@ -1289,6 +1290,10 @@ static int soc15_common_set_clockgating_state(void *handle,
 		soc15_update_rom_medium_grain_clock_gating(adev,
 				state == AMD_CG_STATE_GATE ? true : false);
 		break;
+	case CHIP_ARCTURUS:
+		soc15_update_hdp_light_sleep(adev,
+				state == AMD_CG_STATE_GATE ? true : false);
+		break;
 	default:
 		break;
 	}
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-3-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

Reviewed-by Kenneth Feng
#7 lore raw

RE: [PATCH 3/9] drm/amdgpu: add hdp clock gating for Arcturus

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 3/9] drm/amdgpu: add hdp clock gating for Arcturus

[CAUTION: External Email]

Add hdp CGLS for Arcturus in set common clockgating function

Change-Id I44e392fa5f7653908b36b0902e721d56eed3eb92
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -1
index 00758be..4fbaca3 100644
@@ -1157,7 +1157,8 @@ static void soc15_update_hdp_light_sleep(struct amdgpu_device *adev, bool enable  {
        uint32_t def, data;
 
-       if (adev->asic_type == CHIP_VEGA20) {
+       if (adev->asic_type == CHIP_VEGA20 ||
+               adev->asic_type == CHIP_ARCTURUS) {
                def = data = RREG32(SOC15_REG_OFFSET(HDP, 0, mmHDP_MEM_POWER_CTRL));
 
                if (enable && (adev->cg_flags & AMD_CG_SUPPORT_HDP_LS)) @@ -1289,6 +1290,10 @@ static int soc15_common_set_clockgating_state(void *handle,
                soc15_update_rom_medium_grain_clock_gating(adev,
                                state == AMD_CG_STATE_GATE ? true : false);
                break;
+       case CHIP_ARCTURUS:
+               soc15_update_hdp_light_sleep(adev,
+                               state == AMD_CG_STATE_GATE ? true : false);
+               break;
        default:
                break;
        }

--
2.7.4

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

author
#8 lore raw

PATCH 4/9 drm/amdgpu: enable hdp clock gating for Arcturus

In reply to a message not in the archive

Init hdp MGCG/LS flag as Vega20

Change-Id Ia33ca064f79ac409c53d3beb6f01b6e814a92041
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
index 4fbaca3..6038dce 100644
@@ -1017,7 +1017,9 @@ static int soc15_common_early_init(void *handle)
 			AMD_CG_SUPPORT_GFX_MGLS |
 			AMD_CG_SUPPORT_GFX_CGCG |
 			AMD_CG_SUPPORT_GFX_CGLS |
-			AMD_CG_SUPPORT_GFX_CP_LS;
+			AMD_CG_SUPPORT_GFX_CP_LS |
+			AMD_CG_SUPPORT_HDP_MGCG |
+			AMD_CG_SUPPORT_HDP_LS;
 		adev->pg_flags = 0;
 		adev->external_rev_id = adev->rev_id + 0x32;
 		break;
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-4-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

Reviewed-by Kenneth Feng
#10 lore raw

RE: [PATCH 4/9] drm/amdgpu: enable hdp clock gating for Arcturus

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 4/9] drm/amdgpu: enable hdp clock gating for Arcturus

[CAUTION: External Email]

Init hdp MGCG/LS flag as Vega20

Change-Id Ia33ca064f79ac409c53d3beb6f01b6e814a92041
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
index 4fbaca3..6038dce 100644
@@ -1017,7 +1017,9 @@ static int soc15_common_early_init(void *handle)
                        AMD_CG_SUPPORT_GFX_MGLS |
                        AMD_CG_SUPPORT_GFX_CGCG |
                        AMD_CG_SUPPORT_GFX_CGLS |
-                       AMD_CG_SUPPORT_GFX_CP_LS;
+                       AMD_CG_SUPPORT_GFX_CP_LS |
+                       AMD_CG_SUPPORT_HDP_MGCG |
+                       AMD_CG_SUPPORT_HDP_LS;
                adev->pg_flags = 0;
                adev->external_rev_id = adev->rev_id + 0x32;
                break;

--
2.7.4

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

author
#11 lore raw

PATCH 5/9 drm/amdgpu: support sdma clock gating for more instances

In reply to a message not in the archive

Shorten the code with RREG32_SDMA/WREG32_SDMA macro in CG part.

Change-Id Icbf94169bb703877b105a307f14c708609faaae4
---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 105 +++++++++++----------------------
 1 file changed, 34 insertions(+), 71 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +34 -71
index 7acf947..9e3c63c 100644
@@ -2084,61 +2084,35 @@ static void sdma_v4_0_update_medium_grain_clock_gating(
 		bool enable)
 {
 	uint32_t data, def;
+	int i;
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_SDMA_MGCG)) {
-		/* enable sdma0 clock gating */
-		def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL));
-		data &= ~(SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-			  SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
-		if (def != data)
-			WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL), data);
-
-		if (adev->sdma.num_instances > 1) {
-			def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL));
-			data &= ~(SDMA1_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-				  SDMA1_CLK_CTRL__SOFT_OVERRIDE0_MASK);
+		for (i = 0; i < adev->sdma.num_instances; i++) {
+			def = data = RREG32_SDMA(i, mmSDMA0_CLK_CTRL);
+			data &= ~(SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
+				  SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
 			if (def != data)
-				WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL), data);
+				WREG32_SDMA(i, mmSDMA0_CLK_CTRL, data);
 		}
 	} else {
-		/* disable sdma0 clock gating */
-		def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL));
-		data |= (SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-			 SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
-
-		if (def != data)
-			WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL), data);
-
-		if (adev->sdma.num_instances > 1) {
-			def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL));
-			data |= (SDMA1_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-				 SDMA1_CLK_CTRL__SOFT_OVERRIDE0_MASK);
+		for (i = 0; i < adev->sdma.num_instances; i++) {
+			def = data = RREG32_SDMA(i, mmSDMA0_CLK_CTRL);
+			data |= (SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
+				 SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
 			if (def != data)
-				WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL), data);
+				WREG32_SDMA(i, mmSDMA0_CLK_CTRL, data);
 		}
 	}
 }
@@ -2149,34 +2123,23 @@ static void sdma_v4_0_update_medium_grain_light_sleep(
 		bool enable)
 {
 	uint32_t data, def;
+	int i;
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_SDMA_LS)) {
-		/* 1-not override: enable sdma0 mem light sleep */
-		def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL));
-		data |= SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
-		if (def != data)
-			WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL), data);
-
-		/* 1-not override: enable sdma1 mem light sleep */
-		if (adev->sdma.num_instances > 1) {
-			def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL));
-			data |= SDMA1_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
+		for (i = 0; i < adev->sdma.num_instances; i++) {
+			/* 1-not override: enable sdma mem light sleep */
+			def = data = RREG32_SDMA(0, mmSDMA0_POWER_CNTL);
+			data |= SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
 			if (def != data)
-				WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL), data);
+				WREG32_SDMA(0, mmSDMA0_POWER_CNTL, data);
 		}
 	} else {
-		/* 0-override:disable sdma0 mem light sleep */
-		def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL));
-		data &= ~SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
-		if (def != data)
-			WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL), data);
-
-		/* 0-override:disable sdma1 mem light sleep */
-		if (adev->sdma.num_instances > 1) {
-			def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL));
-			data &= ~SDMA1_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
+		for (i = 0; i < adev->sdma.num_instances; i++) {
+		/* 0-override:disable sdma mem light sleep */
+			def = data = RREG32_SDMA(0, mmSDMA0_POWER_CNTL);
+			data &= ~SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
 			if (def != data)
-				WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL), data);
+				WREG32_SDMA(0, mmSDMA0_POWER_CNTL, data);
 		}
 	}
 }
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-5-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

Reviewed-by Kenneth Feng
#13 lore raw

RE: [PATCH 5/9] drm/amdgpu: support sdma clock gating for more instances

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 5/9] drm/amdgpu: support sdma clock gating for more instances

[CAUTION: External Email]

Shorten the code with RREG32_SDMA/WREG32_SDMA macro in CG part.

Change-Id Icbf94169bb703877b105a307f14c708609faaae4
---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 105 +++++++++++----------------------
 1 file changed, 34 insertions(+), 71 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +34 -71
index 7acf947..9e3c63c 100644
@@ -2084,61 +2084,35 @@ static void sdma_v4_0_update_medium_grain_clock_gating(
                bool enable)
 {
        uint32_t data, def;
+       int i;
 
        if (enable && (adev->cg_flags & AMD_CG_SUPPORT_SDMA_MGCG)) {
-               /* enable sdma0 clock gating */
-               def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL));
-               data &= ~(SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-                         SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
-               if (def != data)
-                       WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL), data);
-
-               if (adev->sdma.num_instances > 1) {
-                       def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL));
-                       data &= ~(SDMA1_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-                                 SDMA1_CLK_CTRL__SOFT_OVERRIDE0_MASK);
+               for (i = 0; i < adev->sdma.num_instances; i++) {
+                       def = data = RREG32_SDMA(i, mmSDMA0_CLK_CTRL);
+                       data &= ~(SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
+                                 SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
                        if (def != data)
-                               WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL), data);
+                               WREG32_SDMA(i, mmSDMA0_CLK_CTRL, data);
                }
        } else {
-               /* disable sdma0 clock gating */
-               def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL));
-               data |= (SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-                        SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
-
-               if (def != data)
-                       WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_CLK_CTRL), data);
-
-               if (adev->sdma.num_instances > 1) {
-                       def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL));
-                       data |= (SDMA1_CLK_CTRL__SOFT_OVERRIDE7_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE6_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE5_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE4_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE3_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE2_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE1_MASK |
-                                SDMA1_CLK_CTRL__SOFT_OVERRIDE0_MASK);
+               for (i = 0; i < adev->sdma.num_instances; i++) {
+                       def = data = RREG32_SDMA(i, mmSDMA0_CLK_CTRL);
+                       data |= (SDMA0_CLK_CTRL__SOFT_OVERRIDE7_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE6_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE5_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE4_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE3_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE2_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE1_MASK |
+                                SDMA0_CLK_CTRL__SOFT_OVERRIDE0_MASK);
                        if (def != data)
-                               WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_CLK_CTRL), data);
+                               WREG32_SDMA(i, mmSDMA0_CLK_CTRL, data);
                }
        }
 }
@@ -2149,34 +2123,23 @@ static void sdma_v4_0_update_medium_grain_light_sleep(
                bool enable)
 {
        uint32_t data, def;
+       int i;
 
        if (enable && (adev->cg_flags & AMD_CG_SUPPORT_SDMA_LS)) {
-               /* 1-not override: enable sdma0 mem light sleep */
-               def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL));
-               data |= SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
-               if (def != data)
-                       WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL), data);
-
-               /* 1-not override: enable sdma1 mem light sleep */
-               if (adev->sdma.num_instances > 1) {
-                       def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL));
-                       data |= SDMA1_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
+               for (i = 0; i < adev->sdma.num_instances; i++) {
+                       /* 1-not override: enable sdma mem light sleep */
+                       def = data = RREG32_SDMA(0, mmSDMA0_POWER_CNTL);
+                       data |= SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
                        if (def != data)
-                               WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL), data);
+                               WREG32_SDMA(0, mmSDMA0_POWER_CNTL, data);
                }
        } else {
-               /* 0-override:disable sdma0 mem light sleep */
-               def = data = RREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL));
-               data &= ~SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
-               if (def != data)
-                       WREG32(SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_POWER_CNTL), data);
-
-               /* 0-override:disable sdma1 mem light sleep */
-               if (adev->sdma.num_instances > 1) {
-                       def = data = RREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL));
-                       data &= ~SDMA1_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
+               for (i = 0; i < adev->sdma.num_instances; i++) {
+               /* 0-override:disable sdma mem light sleep */
+                       def = data = RREG32_SDMA(0, mmSDMA0_POWER_CNTL);
+                       data &= ~SDMA0_POWER_CNTL__MEM_POWER_OVERRIDE_MASK;
                        if (def != data)
-                               WREG32(SOC15_REG_OFFSET(SDMA1, 0, mmSDMA1_POWER_CNTL), data);
+                               WREG32_SDMA(0, mmSDMA0_POWER_CNTL, data);
                }
        }
 }

--
2.7.4

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

author
#14 lore raw

PATCH 6/9 drm/amdgpu: add sdma clock gating for Arcturus

In reply to a message not in the archive

Add ARCTURUS case in sdma set clockgating function

Change-Id I65a3d99a140a8a76949b4d03c20bc6e0195c9854
---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -0
index 9e3c63c..185dff0 100644
@@ -2157,6 +2157,7 @@ static int sdma_v4_0_set_clockgating_state(void *handle,
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_ARCTURUS:
 		sdma_v4_0_update_medium_grain_clock_gating(adev,
 				state == AMD_CG_STATE_GATE ? true : false);
 		sdma_v4_0_update_medium_grain_light_sleep(adev,
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-6-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

Reviewed-by Kenneth Feng
#16 lore raw

RE: [PATCH 6/9] drm/amdgpu: add sdma clock gating for Arcturus

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 6/9] drm/amdgpu: add sdma clock gating for Arcturus

[CAUTION: External Email]

Add ARCTURUS case in sdma set clockgating function

Change-Id I65a3d99a140a8a76949b4d03c20bc6e0195c9854
---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -0
index 9e3c63c..185dff0 100644
@@ -2157,6 +2157,7 @@ static int sdma_v4_0_set_clockgating_state(void *handle,
        case CHIP_VEGA12:
        case CHIP_VEGA20:
        case CHIP_RAVEN:
+       case CHIP_ARCTURUS:
                sdma_v4_0_update_medium_grain_clock_gating(adev,
                                state == AMD_CG_STATE_GATE ? true : false);
                sdma_v4_0_update_medium_grain_light_sleep(adev,

--
2.7.4

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

author
#17 lore raw

PATCH 7/9 drm/amdgpu: enable sdma clock gating for Arcturus

In reply to a message not in the archive

Init sdma MGCG/LS flag

Change-Id I600b8c67b1dfa74240269f2f028960b2c93a0ec2
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
index 6038dce..ad64975 100644
@@ -1019,7 +1019,9 @@ static int soc15_common_early_init(void *handle)
 			AMD_CG_SUPPORT_GFX_CGLS |
 			AMD_CG_SUPPORT_GFX_CP_LS |
 			AMD_CG_SUPPORT_HDP_MGCG |
-			AMD_CG_SUPPORT_HDP_LS;
+			AMD_CG_SUPPORT_HDP_LS |
+			AMD_CG_SUPPORT_SDMA_MGCG |
+			AMD_CG_SUPPORT_SDMA_LS;
 		adev->pg_flags = 0;
 		adev->external_rev_id = adev->rev_id + 0x32;
 		break;
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1565259714-30357-7-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org

author
#19 lore raw

RE: [PATCH 7/9] drm/amdgpu: enable sdma clock gating for Arcturus

This series only contains 7 patches. Sorry for the confusion.

Regards,
Ma Le

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 7/9] drm/amdgpu: enable sdma clock gating for Arcturus

Init sdma MGCG/LS flag

Change-Id I600b8c67b1dfa74240269f2f028960b2c93a0ec2
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
index 6038dce..ad64975 100644
@@ -1019,7 +1019,9 @@ static int soc15_common_early_init(void *handle)
 			AMD_CG_SUPPORT_GFX_CGLS |
 			AMD_CG_SUPPORT_GFX_CP_LS |
 			AMD_CG_SUPPORT_HDP_MGCG |
-			AMD_CG_SUPPORT_HDP_LS;
+			AMD_CG_SUPPORT_HDP_LS |
+			AMD_CG_SUPPORT_SDMA_MGCG |
+			AMD_CG_SUPPORT_SDMA_LS;
 		adev->pg_flags = 0;
 		adev->external_rev_id = adev->rev_id + 0x32;
 		break;
Signature · 10 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by Kenneth Feng
#20 lore raw

RE: [PATCH 7/9] drm/amdgpu: enable sdma clock gating for Arcturus

In reply to a message not in the archive

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 7/9] drm/amdgpu: enable sdma clock gating for Arcturus

[CAUTION: External Email]

Init sdma MGCG/LS flag

Change-Id I600b8c67b1dfa74240269f2f028960b2c93a0ec2
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
index 6038dce..ad64975 100644
@@ -1019,7 +1019,9 @@ static int soc15_common_early_init(void *handle)
                        AMD_CG_SUPPORT_GFX_CGLS |
                        AMD_CG_SUPPORT_GFX_CP_LS |
                        AMD_CG_SUPPORT_HDP_MGCG |
-                       AMD_CG_SUPPORT_HDP_LS;
+                       AMD_CG_SUPPORT_HDP_LS |
+                       AMD_CG_SUPPORT_SDMA_MGCG |
+                       AMD_CG_SUPPORT_SDMA_LS;
                adev->pg_flags = 0;
                adev->external_rev_id = adev->rev_id + 0x32;
                break;

--
2.7.4

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

Reviewed-by Kenneth Feng
#21 lore raw
In reply to a message not in the archive

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Le Ma
Sent: Thursday, August 08, 2019 6:22 PM
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 1/9] drm/amdgpu: add gfx clock gating for Arcturus

[CAUTION: External Email]

Add ARCTURUS case in gfx set clockgating function. No 3d clock on Arcturus.

Change-Id I9893a2afea7f0b5d433baa14f48ae55a36516fac
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -0
index fdd90c1..de3de1c 100644
@@ -4218,6 +4218,9 @@ static void gfx_v9_0_update_3d_clock_gating(struct amdgpu_device *adev,  {
        uint32_t data, def;
 
+       if (adev->asic_type == CHIP_ARCTURUS)
+               return;
+
        amdgpu_gfx_rlc_enter_safe_mode(adev);
 
        /* Enable 3D CGCG/CGLS */
@@ -4410,6 +4413,7 @@ static int gfx_v9_0_set_clockgating_state(void *handle,
        case CHIP_VEGA12:
        case CHIP_VEGA20:
        case CHIP_RAVEN:
+       case CHIP_ARCTURUS:
                gfx_v9_0_update_gfx_clock_gating(adev,
                                                 state == AMD_CG_STATE_GATE ? true : false);
                break;

--
2.7.4

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