summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Zhu2016-03-29 08:34:51 +0200
committerAlex Deucher2016-04-01 16:08:30 +0200
commit5349ece70600bd574d9a825801c00f900acda3d4 (patch)
tree7339717cd2ee669715421e5d0438c1e69e1257ef
parentdrm/amd/powerplay: notify amdgpu whether dpm is enabled or not. (diff)
downloadkernel-qcow2-linux-5349ece70600bd574d9a825801c00f900acda3d4.tar.gz
kernel-qcow2-linux-5349ece70600bd574d9a825801c00f900acda3d4.tar.xz
kernel-qcow2-linux-5349ece70600bd574d9a825801c00f900acda3d4.zip
drm/amdgpu: check dpm state before pm system fs initialized.
Make sure powerplay initialized properly before enabling debugfs pm files. Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed- by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 9430a7d0d0d7..e9c6ae6ed2f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -143,7 +143,7 @@ static int amdgpu_pp_late_init(void *handle)
adev->powerplay.pp_handle);
#ifdef CONFIG_DRM_AMD_POWERPLAY
- if (adev->pp_enabled) {
+ if (adev->pp_enabled && adev->pm.dpm_enabled) {
amdgpu_pm_sysfs_init(adev);
amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_COMPLETE_INIT, NULL, NULL);
}