diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 10 | 
1 files changed, 3 insertions, 7 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c index 3cb6d6c413c7..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);  	} @@ -161,12 +161,8 @@ static int amdgpu_pp_sw_init(void *handle)  					adev->powerplay.pp_handle);  #ifdef CONFIG_DRM_AMD_POWERPLAY -	if (adev->pp_enabled) { -		if (amdgpu_dpm == 0) -			adev->pm.dpm_enabled = false; -		else -			adev->pm.dpm_enabled = true; -	} +	if (adev->pp_enabled) +		adev->pm.dpm_enabled = true;  #endif  	return ret; | 
