From: Alex Deucher Date: Tue, 8 Dec 2015 22:28:28 +0000 (-0500) Subject: drm/amdgpu/powerplay: enable sysfs and debugfs interfaces late X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=898b1dead9a99aeeb103febacf838c7c71d58292;p=linux-beck.git drm/amdgpu/powerplay: enable sysfs and debugfs interfaces late To avoid users accessing them before the module has finished initializing them and make sure they are only created if dpm has properly initialized. Reviewed-by: Christian König Reviewed-by: Jammy Zhou Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c index b8b4a4781f4d..ddb90ebd0e7c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c @@ -131,6 +131,10 @@ static int amdgpu_pp_late_init(void *handle) ret = adev->powerplay.ip_funcs->late_init( adev->powerplay.pp_handle); +#ifdef CONFIG_DRM_AMD_POWERPLAY + if (adev->pp_enabled) + amdgpu_pm_sysfs_init(adev); +#endif return ret; } @@ -145,7 +149,6 @@ static int amdgpu_pp_sw_init(void *handle) #ifdef CONFIG_DRM_AMD_POWERPLAY if (adev->pp_enabled) { - amdgpu_pm_sysfs_init(adev); if (amdgpu_dpm == 0) adev->pm.dpm_enabled = false; else