Skip to contentSkip to conversation

drm/amd/powerplay: move maximum sustainable clock retrieving to .hw_init

PATCH In review Evan Quan 3 participants 3 messages Jun 8, 2020 – Jun 9, 2020

Subsystems (2)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: move maximum sustainable clock retrieving to .hw_init

Since DAL settings come between .hw_init and .late_init of SMU. And DAL needs to know the maximum sustainable clocks.

Change-Id I0702b7332a0d7c0b29dfdf4999c18efb588b8862
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +13 -6
index 725ac90c0f36..6beae3b496be 100644
@@ -819,12 +819,6 @@ static int smu_late_init(void *handle)
 		return ret;
 	}
 
-	ret = smu_init_max_sustainable_clocks(smu);
-	if (ret) {
-		dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
-		return ret;
-	}
-
 	ret = smu_populate_umd_state_clk(smu);
 	if (ret) {
 		dev_err(adev->dev, "Failed to populate UMD state clocks!\n");
@@ -1364,6 +1358,19 @@ static int smu_hw_init(void *handle)
 		return ret;
 	}
 
+	/*
+	 * Move maximum sustainable clock retrieving here considering
+	 * 1. It is not needed on resume(from S3).
+	 * 2. DAL settings come between .hw_init and .late_init of SMU.
+	 *    And DAL needs to know the maximum sustainable clocks. Thus
+	 *    it cannot be put in .late_init().
+	 */
+	ret = smu_init_max_sustainable_clocks(smu);
+	if (ret) {
+		dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
+		return ret;
+	}
+
 	adev->pm.dpm_enabled = true;
 
 	dev_info(adev->dev, "SMU is initialized successfully!\n");
Signature · 6 lines
2.27.0

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

[AMD Public Use]

________________________________
From: Quan, Evan <[email protected]>
Sent: Monday, June 8, 2020 6:46 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>; Cui, Flora <[email protected]>
Subject: [PATCH] drm/amd/powerplay: move maximum sustainable clock retrieving to .hw_init

Since DAL settings come between .hw_init and .late_init of SMU. And DAL needs to know the maximum sustainable clocks.

Change-Id I0702b7332a0d7c0b29dfdf4999c18efb588b8862
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +13 -6
index 725ac90c0f36..6beae3b496be 100644
@@ -819,12 +819,6 @@ static int smu_late_init(void *handle)
                 return ret;
         }
 
-       ret = smu_init_max_sustainable_clocks(smu);
-       if (ret) {
-               dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
-               return ret;
-       }
-
         ret = smu_populate_umd_state_clk(smu);
         if (ret) {
                 dev_err(adev->dev, "Failed to populate UMD state clocks!\n");
@@ -1364,6 +1358,19 @@ static int smu_hw_init(void *handle)
                 return ret;
         }
 
+       /*
+        * Move maximum sustainable clock retrieving here considering
+        * 1. It is not needed on resume(from S3).
+        * 2. DAL settings come between .hw_init and .late_init of SMU.
+        *    And DAL needs to know the maximum sustainable clocks. Thus
+        *    it cannot be put in .late_init().
+        */
+       ret = smu_init_max_sustainable_clocks(smu);
+       if (ret) {
+               dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
+               return ret;
+       }
+
         adev->pm.dpm_enabled = true;
 
         dev_info(adev->dev, "SMU is initialized successfully!\n");

--
2.27.0

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

Acked-by Alex Deucher
#2 lore raw

[AMD Public Use]

Reported-and-tested-by Flora Cui <[email protected]>

From: Deucher, Alexander <[email protected]>
Sent: Monday, June 8, 2020 11:02 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Cui, Flora <[email protected]>
Subject: Re: [PATCH] drm/amd/powerplay: move maximum sustainable clock retrieving to .hw_init

[AMD Public Use]

________________________________
From: Quan, Evan <[email protected]<mailto:[email protected]>>
Sent: Monday, June 8, 2020 6:46 AM
To: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Cc: Deucher, Alexander <[email protected]<mailto:[email protected]>>; Quan, Evan <[email protected]<mailto:[email protected]>>; Cui, Flora <[email protected]<mailto:[email protected]>>
Subject: [PATCH] drm/amd/powerplay: move maximum sustainable clock retrieving to .hw_init

Since DAL settings come between .hw_init and .late_init of SMU. And DAL needs to know the maximum sustainable clocks.

Change-Id I0702b7332a0d7c0b29dfdf4999c18efb588b8862
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +13 -6
index 725ac90c0f36..6beae3b496be 100644
@@ -819,12 +819,6 @@ static int smu_late_init(void *handle)
                 return ret;
         }
 
-       ret = smu_init_max_sustainable_clocks(smu);
-       if (ret) {
-               dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
-               return ret;
-       }
-
         ret = smu_populate_umd_state_clk(smu);
         if (ret) {
                 dev_err(adev->dev, "Failed to populate UMD state clocks!\n");
@@ -1364,6 +1358,19 @@ static int smu_hw_init(void *handle)
                 return ret;
         }
 
+       /*
+        * Move maximum sustainable clock retrieving here considering
+        * 1. It is not needed on resume(from S3).
+        * 2. DAL settings come between .hw_init and .late_init of SMU.
+        *    And DAL needs to know the maximum sustainable clocks. Thus
+        *    it cannot be put in .late_init().
+        */
+       ret = smu_init_max_sustainable_clocks(smu);
+       if (ret) {
+               dev_err(adev->dev, "Failed to init max sustainable clocks!\n");
+               return ret;
+       }
+
         adev->pm.dpm_enabled = true;
 
         dev_info(adev->dev, "SMU is initialized successfully!\n");

--
2.27.0

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