Skip to contentSkip to conversation

drm/amd/powerplay: skip i2c eeprom init/fini under sriov mode

PATCH In review Hua Zhang 2 participants 2 messages May 22, 2020

Subsystems (2)
lore
Share & tools
lore

Hua Zhang

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: skip i2c eeprom init/fini under sriov mode

i2c eeprom init/fini is only needed under bare mental mode.

---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +14 -10
index 8017386d3c33..a78a1f542ea9 100644
@@ -1363,9 +1363,11 @@ static int smu_hw_init(void *handle)
 	if (ret)
 		goto failed;
 
-	ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
-	if (ret)
-		goto failed;
+	if (!amdgpu_sriov_vf(adev)) {
+		ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
+		if (ret)
+			goto failed;
+	}
 
 	adev->pm.dpm_enabled = true;
 
@@ -1406,9 +1408,9 @@ static int smu_hw_fini(void *handle)
 
 	adev->pm.dpm_enabled = false;
 
-	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
-
 	if (!amdgpu_sriov_vf(adev)){
+		smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
+
 		ret = smu_stop_thermal_control(smu);
 		if (ret) {
 			pr_warn("Fail to stop thermal control!\n");
@@ -1549,9 +1551,9 @@ static int smu_suspend(void *handle)
 
 	adev->pm.dpm_enabled = false;
 
-	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
+	if (!amdgpu_sriov_vf(adev)) {
+		smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
 
-	if(!amdgpu_sriov_vf(adev)) {
 		ret = smu_disable_dpm(smu);
 		if (ret)
 			return ret;
@@ -1596,9 +1598,11 @@ static int smu_resume(void *handle)
 	if (ret)
 		goto failed;
 
-	ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
-	if (ret)
-		goto failed;
+	if (!amdgpu_sriov_vf(adev)) {
+		ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
+		if (ret)
+			goto failed;
+	}
 
 	if (smu->is_apu)
 		smu_set_gfx_cgpg(&adev->smu, true);
Signature · 6 lines
2.25.1

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

[AMD Official Use Only - Internal Distribution Only]

please add a detailed description of the reason for this patch, after finshed, the patch is

Best Regards,
Kevin
________________________________
From: amd-gfx <[email protected]> on behalf of Hua Zhang <[email protected]>
Sent: Friday, May 22, 2020 1:31 PM
To: [email protected] <[email protected]>
Cc: Zhang, Hua <[email protected]>
Subject: [PATCH] drm/amd/powerplay: skip i2c eeprom init/fini under sriov mode

i2c eeprom init/fini is only needed under bare mental mode.

---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +14 -10
index 8017386d3c33..a78a1f542ea9 100644
@@ -1363,9 +1363,11 @@ static int smu_hw_init(void *handle)
         if (ret)
                 goto failed;
 
-       ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
-       if (ret)
-               goto failed;
+       if (!amdgpu_sriov_vf(adev)) {
+               ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
+               if (ret)
+                       goto failed;
+       }
 
         adev->pm.dpm_enabled = true;
 
@@ -1406,9 +1408,9 @@ static int smu_hw_fini(void *handle)
 
         adev->pm.dpm_enabled = false;
 
-       smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
-
         if (!amdgpu_sriov_vf(adev)){
+               smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
+
                 ret = smu_stop_thermal_control(smu);
                 if (ret) {
                         pr_warn("Fail to stop thermal control!\n");
@@ -1549,9 +1551,9 @@ static int smu_suspend(void *handle)
 
         adev->pm.dpm_enabled = false;
 
-       smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
+       if (!amdgpu_sriov_vf(adev)) {
+               smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
 
-       if(!amdgpu_sriov_vf(adev)) {
                 ret = smu_disable_dpm(smu);
                 if (ret)
                         return ret;
@@ -1596,9 +1598,11 @@ static int smu_resume(void *handle)
         if (ret)
                 goto failed;
 
-       ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
-       if (ret)
-               goto failed;
+       if (!amdgpu_sriov_vf(adev)) {
+               ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);
+               if (ret)
+                       goto failed;
+       }
 
         if (smu->is_apu)
                 smu_set_gfx_cgpg(&adev->smu, true);

--
2.25.1

_______________________________________________
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=02%7C01%7CKevin1.Wang%40amd.com%7Cc8e0d6a298474263093c08d7fe115797%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637257222795940615&amp;sdata=LR7lQJ3I2XorNFokkz%2FRe6JK6H3TT3hlprc6EWHNPpI%3D&amp;reserved=0

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