Skip to contentSkip to conversation

drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table

PATCH In review Alex Deucher 2 participants 4 messages Nov 3, 2020 – Nov 4, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table

For kernel 5.10, this function was called twice due to what looks like a mis-merge.

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -11
index fc4f95fa87cf..b1e5ec01527b 100644
@@ -1029,17 +1029,6 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 		return ret;
 	}
 
-	/*
-	 * Set initialized values (get from vbios) to dpm tables context such as
-	 * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
-	 * type of clks.
-	 */
-	ret = smu_set_default_dpm_table(smu);
-	if (ret) {
-		dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
-		return ret;
-	}
-
 	ret = smu_notify_display_change(smu);
 	if (ret)
 		return ret;
Signature · 6 lines
2.25.4

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

[AMD Official Use Only - Internal Distribution Only]

Hi Alex,

Where is the other place the smu_set_default_dpm_table get called? smu_late_init()?
If yes, you probably need to leave the one from smu_smc_hw_setup but drop another one from smu_late_init().

BR
Evan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, November 4, 2020 7:25 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH] drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table

For kernel 5.10, this function was called twice due to what looks like a mis-merge.

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -11
index fc4f95fa87cf..b1e5ec01527b 100644
@@ -1029,17 +1029,6 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 return ret;
 }
 
-/*
- * Set initialized values (get from vbios) to dpm tables context such as
- * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
- * type of clks.
- */
-ret = smu_set_default_dpm_table(smu);
-if (ret) {
-dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
-return ret;
-}
-
 ret = smu_notify_display_change(smu);
 if (ret)
 return ret;

--
2.25.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Cevan.quan%40amd.com%7Cf1a68accb24f48fd825808d8804fa821%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637400426909200216%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=5MGn5WBff4yyAoZra9NGHILEKIWp0iH0ysL55Nj%2BFcQ%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw
Quoted 7 lines · Evan

[AMD Official Use Only - Internal Distribution Only]

Hi Alex,

Where is the other place the smu_set_default_dpm_table get called? smu_late_init()?
If yes, you probably need to leave the one from smu_smc_hw_setup but drop another one from smu_late_init().

Right above it. See:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c#n1020

Alex

Quoted 42 lines

BR
Evan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, November 4, 2020 7:25 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH] drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table

For kernel 5.10, this function was called twice due to what looks like a mis-merge.

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -12
index fc4f95fa87cf..b1e5ec01527b 100644
@@ -1029,17 +1029,6 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 return ret;
 }
 
-/*
- * Set initialized values (get from vbios) to dpm tables context such as
- * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
- * type of clks.
- */
-ret = smu_set_default_dpm_table(smu);
-if (ret) {
-dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
-return ret;
-}
-
 ret = smu_notify_display_change(smu);
 if (ret)
 return ret;
--

2.25.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Cevan.quan%40amd.com%7Cf1a68accb24f48fd825808d8804fa821%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637400426909200216%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=5MGn5WBff4yyAoZra9NGHILEKIWp0iH0ysL55Nj%2BFcQ%3D&amp;reserved=0

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

Reviewed-by
#3 lore raw

[AMD Official Use Only - Internal Distribution Only]

OK. That will be fine then.

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Wednesday, November 4, 2020 9:19 AM
To: Quan, Evan <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table

Quoted 7 lines · Evan

[AMD Official Use Only - Internal Distribution Only]

Hi Alex,

Where is the other place the smu_set_default_dpm_table get called? smu_late_init()?
If yes, you probably need to leave the one from smu_smc_hw_setup but drop another one from smu_late_init().

Right above it. See:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git%2Ftree%2Fdrivers%2Fgpu%2Fdrm%2Famd%2Fpm%2Fswsmu%2Famdgpu_smu.c%23n1020&amp;data=04%7C01%7CEvan.Quan%40amd.com%7Ca8968603f87a43bef29308d8805fb530%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637400495838063628%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=d2byGlfRMd3%2FTkuwbCmr4QxEL1CIVxYTIg5OI9Utk8A%3D&amp;reserved=0

Alex

Quoted 41 lines

BR
Evan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, November 4, 2020 7:25 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH] drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table

For kernel 5.10, this function was called twice due to what looks like a mis-merge.

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -2
index fc4f95fa87cf..b1e5ec01527b 100644
@@ -1029,17 +1029,6 @@ static int smu_smc_hw_setup(struct smu_context
 *smu)  return ret;  }
 
-/*
- * Set initialized values (get from vbios) to dpm tables context such

as
- * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
- * type of clks.
- */
-ret = smu_set_default_dpm_table(smu); -if (ret) { -dev_err(adev->dev, "Failed to setup default dpm clock tables!\n"); -return ret; -} -
ret = smu_notify_display_change(smu); if (ret) return ret;
--
2.25.4

Quoted 10 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7CEv an.Quan%40amd.com%7Ca8968603f87a43bef29308d8805fb530%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637400495838063628%7CUnknown%7CTWFpbGZsb3d 8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C 1000&amp;sdata=CV4QagcDUCDKFiwx3YG%2F8Wt9nR2MRSrIXhBTZZ0FwsY%3D&amp;re served=0

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