* [PATCH] drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.
@ 2017-07-04 8:42 Rex Zhu
[not found] ` <1499157736-5720-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Rex Zhu @ 2017-07-04 8:42 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Rex Zhu
when hw_fini, pp will disable dpm.so remove sysfs before
disable dpm.
Change-Id: I17114f5c964b870802abbde32544b28eeb6173ab
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index f5ae871..6eaeae0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -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
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.
[not found] ` <1499157736-5720-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
@ 2017-07-04 14:07 ` Alex Deucher
2017-07-05 2:23 ` Michel Dänzer
1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2017-07-04 14:07 UTC (permalink / raw)
To: Rex Zhu; +Cc: amd-gfx list
On Tue, Jul 4, 2017 at 4:42 AM, Rex Zhu <Rex.Zhu@amd.com> wrote:
> when hw_fini, pp will disable dpm.so remove sysfs before
> disable dpm.
>
> Change-Id: I17114f5c964b870802abbde32544b28eeb6173ab
> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> index f5ae871..6eaeae0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> @@ -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
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.
[not found] ` <1499157736-5720-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-07-04 14:07 ` Alex Deucher
@ 2017-07-05 2:23 ` Michel Dänzer
1 sibling, 0 replies; 3+ messages in thread
From: Michel Dänzer @ 2017-07-05 2:23 UTC (permalink / raw)
To: Rex Zhu; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 04/07/17 05:42 PM, Rex Zhu wrote:
> when hw_fini, pp will disable dpm.so remove sysfs before
> disable dpm.
>
> Change-Id: I17114f5c964b870802abbde32544b28eeb6173ab
> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> index f5ae871..6eaeae0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> @@ -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);
> }
>
>
Thanks Rex, now I can finally cleanly unload amdgpu and load it again. :)
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-05 2:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-04 8:42 [PATCH] drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu Rex Zhu
[not found] ` <1499157736-5720-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-07-04 14:07 ` Alex Deucher
2017-07-05 2:23 ` Michel Dänzer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.