diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 15 | 
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index b03b1eb7ba04..abe94a55ecad 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -41,8 +41,6 @@  #include "hwmgr.h"  #define WIDTH_4K 3840 -static int amdgpu_debugfs_pm_init(struct amdgpu_device *adev); -  static const struct cg_flag_name clocks[] = {  	{AMD_CG_SUPPORT_GFX_MGCG, "Graphics Medium Grain Clock Gating"},  	{AMD_CG_SUPPORT_GFX_MGLS, "Graphics Medium Grain memory Light Sleep"}, @@ -91,9 +89,13 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev)  			adev->pm.ac_power = true;  		else  			adev->pm.ac_power = false; -		if (adev->powerplay.pp_funcs->enable_bapm) +		if (adev->powerplay.pp_funcs && +		    adev->powerplay.pp_funcs->enable_bapm)  			amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power);  		mutex_unlock(&adev->pm.mutex); + +		if (is_support_sw_smu(adev)) +			smu_set_ac_dc(&adev->smu);  	}  } @@ -3398,11 +3400,6 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)  		DRM_ERROR("failed to create device file unique_id\n");  		return ret;  	} -	ret = amdgpu_debugfs_pm_init(adev); -	if (ret) { -		DRM_ERROR("Failed to register debugfs file for dpm!\n"); -		return ret; -	}  	if ((adev->asic_type >= CHIP_VEGA10) &&  	    !(adev->flags & AMD_IS_APU)) { @@ -3669,7 +3666,7 @@ static const struct drm_info_list amdgpu_pm_info_list[] = {  };  #endif -static int amdgpu_debugfs_pm_init(struct amdgpu_device *adev) +int amdgpu_debugfs_pm_init(struct amdgpu_device *adev)  {  #if defined(CONFIG_DEBUG_FS)  	return amdgpu_debugfs_add_files(adev, amdgpu_pm_info_list, ARRAY_SIZE(amdgpu_pm_info_list));  | 
