diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-19 00:44:10 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-19 00:44:10 +0000 |
commit | 8b58f0a15bf10a7e6a2967dca5aebc11a60998c6 (patch) | |
tree | 7abd2bf5b3368dddc614ceebd5b5fc701b145ca3 | |
parent | 8f7d897aab6e0fa036d40dfd7f32fdd169040af8 (diff) |
drm/amd/pm: resolve reboot exception for si oland
From Guchun Chen
0f8f233ed76754b0c9262eb2e82f8529da0bef16 in linux-6.1.y/6.1.33
e490d60a2f76bff636c68ce4fe34c1b6c34bbd86 in mainline linux
-rw-r--r-- | sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c b/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c index 49c398ec0aa..c89cfef7caf 100644 --- a/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c +++ b/sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c @@ -6925,23 +6925,6 @@ static int si_dpm_enable(struct amdgpu_device *adev) return 0; } -static int si_set_temperature_range(struct amdgpu_device *adev) -{ - int ret; - - ret = si_thermal_enable_alert(adev, false); - if (ret) - return ret; - ret = si_thermal_set_temperature_range(adev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX); - if (ret) - return ret; - ret = si_thermal_enable_alert(adev, true); - if (ret) - return ret; - - return ret; -} - static void si_dpm_disable(struct amdgpu_device *adev) { struct rv7xx_power_info *pi = rv770_get_pi(adev); @@ -7626,18 +7609,6 @@ static int si_dpm_process_interrupt(struct amdgpu_device *adev, static int si_dpm_late_init(void *handle) { - int ret; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - if (!adev->pm.dpm_enabled) - return 0; - - ret = si_set_temperature_range(adev); - if (ret) - return ret; -#if 0 //TODO ? - si_dpm_powergate_uvd(adev, true); -#endif return 0; } |