diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3284-drm-amdgpu-pp-remove-the-get_temperature-API.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3284-drm-amdgpu-pp-remove-the-get_temperature-API.patch | 198 |
1 files changed, 198 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3284-drm-amdgpu-pp-remove-the-get_temperature-API.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3284-drm-amdgpu-pp-remove-the-get_temperature-API.patch new file mode 100644 index 00000000..80c32a9c --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3284-drm-amdgpu-pp-remove-the-get_temperature-API.patch @@ -0,0 +1,198 @@ +From 4871dfee005611bd01b80fbb4d5f39d7934ed877 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Wed, 24 Jan 2018 17:44:48 -0500 +Subject: [PATCH 3284/4131] drm/amdgpu/pp: remove the get_temperature API + +This is also supported with the read_sensor API and there +were no more users of the get_temperature API. + +Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + +Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c + +Change-Id: Ifb38835fb206842cf4593eca9bff90f066c7c5dd +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 3 --- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 --- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 1 - + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 1 - + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 1 - + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 - + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 24 ---------------------- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 1 - + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 - + 11 files changed, 38 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +index 882c7a3..e2d600e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +@@ -265,9 +265,6 @@ enum amdgpu_pcie_gen { + #define amdgpu_dpm_read_sensor(adev, idx, value, size) \ + ((adev)->powerplay.pp_funcs->read_sensor((adev)->powerplay.pp_handle, (idx), (value), (size))) + +-#define amdgpu_dpm_get_temperature(adev) \ +- ((adev)->powerplay.pp_funcs->get_temperature((adev)->powerplay.pp_handle)) +- + #define amdgpu_dpm_set_fan_control_mode(adev, m) \ + ((adev)->powerplay.pp_funcs->set_fan_control_mode((adev)->powerplay.pp_handle, (m))) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index 16d795f..4c3c241 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -1617,9 +1617,6 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) + if (adev->pm.dpm_enabled == 0) + return 0; + +- if (adev->powerplay.pp_funcs->get_temperature == NULL) +- return 0; +- + adev->pm.int_hwmon_dev = hwmon_device_register_with_groups(adev->dev, + DRIVER_NAME, adev, + hwmon_groups); +diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c +index ab45232..5ceb5a2 100644 +--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c ++++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c +@@ -7029,7 +7029,6 @@ const struct amd_ip_funcs ci_dpm_ip_funcs = { + }; + + const struct amd_pm_funcs ci_dpm_funcs = { +- .get_temperature = &ci_dpm_get_temp, + .pre_set_power_state = &ci_dpm_pre_set_power_state, + .set_power_state = &ci_dpm_set_power_state, + .post_set_power_state = &ci_dpm_post_set_power_state, +diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c +index d9e9e52..8766681 100644 +--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c ++++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c +@@ -3319,7 +3319,6 @@ const struct amd_ip_funcs kv_dpm_ip_funcs = { + }; + + const struct amd_pm_funcs kv_dpm_funcs = { +- .get_temperature = &kv_dpm_get_temp, + .pre_set_power_state = &kv_dpm_pre_set_power_state, + .set_power_state = &kv_dpm_set_power_state, + .post_set_power_state = &kv_dpm_post_set_power_state, +diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c +index c88447d..424f17a0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c ++++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c +@@ -8032,7 +8032,6 @@ const struct amd_ip_funcs si_dpm_ip_funcs = { + }; + + const struct amd_pm_funcs si_dpm_funcs = { +- .get_temperature = &si_dpm_get_temp, + .pre_set_power_state = &si_dpm_pre_set_power_state, + .set_power_state = &si_dpm_set_power_state, + .post_set_power_state = &si_dpm_post_set_power_state, +diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h b/drivers/gpu/drm/amd/include/kgd_pp_interface.h +index b9aa9f4..1fc995b 100644 +--- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h ++++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h +@@ -241,7 +241,6 @@ struct amd_pm_funcs { + void *rps, + bool *equal); + /* export for sysfs */ +- int (*get_temperature)(void *handle); + void (*set_fan_control_mode)(void *handle, u32 mode); + u32 (*get_fan_control_mode)(void *handle); + int (*set_fan_speed_percent)(void *handle, u32 speed); +diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +index f8d11a7..55ffada 100644 +--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c ++++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +@@ -687,29 +687,6 @@ static int pp_dpm_get_fan_speed_rpm(void *handle, uint32_t *rpm) + return ret; + } + +-static int pp_dpm_get_temperature(void *handle) +-{ +- struct pp_hwmgr *hwmgr; +- struct pp_instance *pp_handle = (struct pp_instance *)handle; +- int ret = 0; +- +- ret = pp_check(pp_handle); +- +- if (ret) +- return ret; +- +- hwmgr = pp_handle->hwmgr; +- +- if (hwmgr->hwmgr_func->get_temperature == NULL) { +- pr_info("%s was not implemented.\n", __func__); +- return 0; +- } +- mutex_lock(&pp_handle->pp_lock); +- ret = hwmgr->hwmgr_func->get_temperature(hwmgr); +- mutex_unlock(&pp_handle->pp_lock); +- return ret; +-} +- + static int pp_dpm_get_pp_num_states(void *handle, + struct pp_states_info *data) + { +@@ -1493,7 +1470,6 @@ static int pp_get_display_mode_validation_clocks(void *handle, + } + + const struct amd_pm_funcs pp_dpm_funcs = { +- .get_temperature = pp_dpm_get_temperature, + .load_firmware = pp_dpm_load_fw, + .wait_for_fw_loading_complete = pp_dpm_fw_loading_complete, + .force_performance_level = pp_dpm_force_performance_level, +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +index dec8dd9..1394b2b 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +@@ -1907,7 +1907,6 @@ static const struct pp_hwmgr_func cz_hwmgr_funcs = { + .get_current_shallow_sleep_clocks = cz_get_current_shallow_sleep_clocks, + .get_clock_by_type = cz_get_clock_by_type, + .get_max_high_clocks = cz_get_max_high_clocks, +- .get_temperature = cz_thermal_get_temperature, + .read_sensor = cz_read_sensor, + .power_off_asic = cz_power_off_asic, + .asic_setup = cz_setup_asic_task, +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +index 686eb3f..f901acc 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +@@ -4954,7 +4954,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = { + .display_config_changed = smu7_display_configuration_changed_task, + .set_max_fan_pwm_output = smu7_set_max_fan_pwm_output, + .set_max_fan_rpm_output = smu7_set_max_fan_rpm_output, +- .get_temperature = smu7_thermal_get_temperature, + .stop_thermal_controller = smu7_thermal_stop_thermal_controller, + .get_fan_speed_info = smu7_fan_ctrl_get_fan_speed_info, + .get_fan_speed_percent = smu7_fan_ctrl_get_fan_speed_percent, +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +index 8982c05..143fbca 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +@@ -5123,7 +5123,6 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = { + .notify_smc_display_config_after_ps_adjustment = + vega10_notify_smc_display_config_after_ps_adjustment, + .force_dpm_level = vega10_dpm_force_dpm_level, +- .get_temperature = vega10_thermal_get_temperature, + .stop_thermal_controller = vega10_thermal_stop_thermal_controller, + .get_fan_speed_info = vega10_fan_ctrl_get_fan_speed_info, + .get_fan_speed_percent = vega10_fan_ctrl_get_fan_speed_percent, +diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +index 604a7cb..5512dc2 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +@@ -279,7 +279,6 @@ struct pp_hwmgr_func { + const uint32_t *msg_id); + int (*set_max_fan_rpm_output)(struct pp_hwmgr *hwmgr, uint16_t us_max_fan_pwm); + int (*set_max_fan_pwm_output)(struct pp_hwmgr *hwmgr, uint16_t us_max_fan_pwm); +- int (*get_temperature)(struct pp_hwmgr *hwmgr); + int (*stop_thermal_controller)(struct pp_hwmgr *hwmgr); + int (*get_fan_speed_info)(struct pp_hwmgr *hwmgr, struct phm_fan_speed_info *fan_speed_info); + void (*set_fan_control_mode)(struct pp_hwmgr *hwmgr, uint32_t mode); +-- +2.7.4 + |