Skip to content

Commit e490d60

Browse files
Guchun Chenalexdeucher
authored andcommitted
drm/amd/pm: resolve reboot exception for si oland
During reboot test on arm64 platform, it may failure on boot. The error message are as follows: [ 1.706570][ 3] [ T273] [drm:si_thermal_enable_alert [amdgpu]] *ERROR* Could not enable thermal interrupts. [ 1.716547][ 3] [ T273] [drm:amdgpu_device_ip_late_init [amdgpu]] *ERROR* late_init of IP block <si_dpm> failed -22 [ 1.727064][ 3] [ T273] amdgpu 0000:02:00.0: amdgpu_device_ip_late_init failed [ 1.734367][ 3] [ T273] amdgpu 0000:02:00.0: Fatal error during GPU init v2: squash in built warning fix (Alex) Signed-off-by: Zhenneng Li <[email protected]> Reviewed-by: Guchun Chen <[email protected]> Signed-off-by: Guchun Chen <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent bc3e1d6 commit e490d60

File tree

1 file changed

+0
-29
lines changed
  • drivers/gpu/drm/amd/pm/legacy-dpm

1 file changed

+0
-29
lines changed

drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6925,23 +6925,6 @@ static int si_dpm_enable(struct amdgpu_device *adev)
69256925
return 0;
69266926
}
69276927

6928-
static int si_set_temperature_range(struct amdgpu_device *adev)
6929-
{
6930-
int ret;
6931-
6932-
ret = si_thermal_enable_alert(adev, false);
6933-
if (ret)
6934-
return ret;
6935-
ret = si_thermal_set_temperature_range(adev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
6936-
if (ret)
6937-
return ret;
6938-
ret = si_thermal_enable_alert(adev, true);
6939-
if (ret)
6940-
return ret;
6941-
6942-
return ret;
6943-
}
6944-
69456928
static void si_dpm_disable(struct amdgpu_device *adev)
69466929
{
69476930
struct rv7xx_power_info *pi = rv770_get_pi(adev);
@@ -7626,18 +7609,6 @@ static int si_dpm_process_interrupt(struct amdgpu_device *adev,
76267609

76277610
static int si_dpm_late_init(void *handle)
76287611
{
7629-
int ret;
7630-
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
7631-
7632-
if (!adev->pm.dpm_enabled)
7633-
return 0;
7634-
7635-
ret = si_set_temperature_range(adev);
7636-
if (ret)
7637-
return ret;
7638-
#if 0 //TODO ?
7639-
si_dpm_powergate_uvd(adev, true);
7640-
#endif
76417612
return 0;
76427613
}
76437614

0 commit comments

Comments
 (0)