drm/amd/pm: resolve reboot exception for si oland
authorjsg <jsg@openbsd.org>
Mon, 19 Jun 2023 00:44:09 +0000 (00:44 +0000)
committerjsg <jsg@openbsd.org>
Mon, 19 Jun 2023 00:44:09 +0000 (00:44 +0000)
From Guchun Chen
0f8f233ed76754b0c9262eb2e82f8529da0bef16 in linux-6.1.y/6.1.33
e490d60a2f76bff636c68ce4fe34c1b6c34bbd86 in mainline linux

sys/dev/pci/drm/amd/pm/legacy-dpm/amdgpu_si_dpm.c

index 49c398e..c89cfef 100644 (file)
@@ -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;
 }