Skip to contentSkip to conversation

drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.

PATCH In review Rex Zhu 3 participants 3 messages Jul 4, 2017 – Jul 5, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.

when hw_fini, pp will disable dpm.so remove sysfs before disable dpm.

Change-Id I17114f5c964b870802abbde32544b28eeb6173ab
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +3 -3
index f5ae871..6eaeae0 100644
@@ -187,6 +187,9 @@ static int amdgpu_pp_hw_fini(void *handle)
 	int ret = 0;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+	if (adev->pp_enabled && adev->pm.dpm_enabled)
+		amdgpu_pm_sysfs_fini(adev);
+
 	if (adev->powerplay.ip_funcs->hw_fini)
 		ret = adev->powerplay.ip_funcs->hw_fini(
 					adev->powerplay.pp_handle);
@@ -205,9 +208,6 @@ static void amdgpu_pp_late_fini(void *handle)
 		adev->powerplay.ip_funcs->late_fini(
 			  adev->powerplay.pp_handle);
 
-	if (adev->pp_enabled && adev->pm.dpm_enabled)
-		amdgpu_pm_sysfs_fini(adev);
-
 	amd_powerplay_destroy(adev->powerplay.pp_handle);
 }
 
Signature · 6 lines
1.9.1

_______________________________________________
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): 1499157736-5720-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 5 lines · Rex Zhu

when hw_fini, pp will disable dpm.so remove sysfs before disable dpm.

Change-Id I17114f5c964b870802abbde32544b28eeb6173ab
Quoted 31 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +3 -4
index f5ae871..6eaeae0 100644
@@ -187,6 +187,9 @@ static int amdgpu_pp_hw_fini(void *handle)
        int ret = 0;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       if (adev->pp_enabled && adev->pm.dpm_enabled)
+               amdgpu_pm_sysfs_fini(adev);
+
        if (adev->powerplay.ip_funcs->hw_fini)
                ret = adev->powerplay.ip_funcs->hw_fini(
                                        adev->powerplay.pp_handle);
@@ -205,9 +208,6 @@ static void amdgpu_pp_late_fini(void *handle)
                adev->powerplay.ip_funcs->late_fini(
                          adev->powerplay.pp_handle);
 
-       if (adev->pp_enabled && adev->pm.dpm_enabled)
-               amdgpu_pm_sysfs_fini(adev);
-
        amd_powerplay_destroy(adev->powerplay.pp_handle);
 }
 
--

1.9.1

Quoted 4 lines

_______________________________________________
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

Tested-by
#3 lore raw
In reply to a message not in the archive
Quoted 25 lines · Rex Zhu

when hw_fini, pp will disable dpm.so remove sysfs before disable dpm.

Change-Id I17114f5c964b870802abbde32544b28eeb6173ab
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +3 -0
index f5ae871..6eaeae0 100644
@@ -187,6 +187,9 @@ static int amdgpu_pp_hw_fini(void *handle)
 	int ret = 0;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+	if (adev->pp_enabled && adev->pm.dpm_enabled)
+		amdgpu_pm_sysfs_fini(adev);
+
 	if (adev->powerplay.ip_funcs->hw_fini)
 		ret = adev->powerplay.ip_funcs->hw_fini(
 					adev->powerplay.pp_handle);

drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c static void amdgpu_pp_late_fini(void *handle) · line 213

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +0 -3
@@ -205,9 +208,6 @@ static void amdgpu_pp_late_fini(void *handle)
 		adev->powerplay.ip_funcs->late_fini(
 			  adev->powerplay.pp_handle);
 
-	if (adev->pp_enabled && adev->pm.dpm_enabled)
-		amdgpu_pm_sysfs_fini(adev);
-
 	amd_powerplay_destroy(adev->powerplay.pp_handle);
 }
 

Thanks Rex, now I can finally cleanly unload amdgpu and load it again. :)

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx