Commit 2ab4d0e7 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher

drm/amdgpu: Update power state at the end of smu hw_init.

For SI/Kv, the power state is managed by function
amdgpu_pm_compute_clocks.

when dpm enabled, we should call amdgpu_pm_compute_clocks
to update current power state instand of set boot state.

this change can fix the oops when kfd driver was enabled on Kv.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6d39df14
...@@ -1353,8 +1353,6 @@ static int kv_dpm_enable(struct amdgpu_device *adev) ...@@ -1353,8 +1353,6 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
return ret; return ret;
} }
kv_update_current_ps(adev, adev->pm.dpm.boot_ps);
if (adev->irq.installed && if (adev->irq.installed &&
amdgpu_is_internal_thermal_sensor(adev->pm.int_thermal_type)) { amdgpu_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
ret = kv_set_thermal_temperature_range(adev, KV_TEMP_RANGE_MIN, KV_TEMP_RANGE_MAX); ret = kv_set_thermal_temperature_range(adev, KV_TEMP_RANGE_MIN, KV_TEMP_RANGE_MAX);
...@@ -3069,7 +3067,7 @@ static int kv_dpm_hw_init(void *handle) ...@@ -3069,7 +3067,7 @@ static int kv_dpm_hw_init(void *handle)
else else
adev->pm.dpm_enabled = true; adev->pm.dpm_enabled = true;
mutex_unlock(&adev->pm.mutex); mutex_unlock(&adev->pm.mutex);
amdgpu_pm_compute_clocks(adev);
return ret; return ret;
} }
......
...@@ -6887,7 +6887,6 @@ static int si_dpm_enable(struct amdgpu_device *adev) ...@@ -6887,7 +6887,6 @@ static int si_dpm_enable(struct amdgpu_device *adev)
si_enable_auto_throttle_source(adev, AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL, true); si_enable_auto_throttle_source(adev, AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
si_thermal_start_thermal_controller(adev); si_thermal_start_thermal_controller(adev);
ni_update_current_ps(adev, boot_ps);
return 0; return 0;
} }
...@@ -7763,7 +7762,7 @@ static int si_dpm_hw_init(void *handle) ...@@ -7763,7 +7762,7 @@ static int si_dpm_hw_init(void *handle)
else else
adev->pm.dpm_enabled = true; adev->pm.dpm_enabled = true;
mutex_unlock(&adev->pm.mutex); mutex_unlock(&adev->pm.mutex);
amdgpu_pm_compute_clocks(adev);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment