aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3900-drm-amd-pp-Refine-register_thermal_interrupt-functio.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3900-drm-amd-pp-Refine-register_thermal_interrupt-functio.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3900-drm-amd-pp-Refine-register_thermal_interrupt-functio.patch166
1 files changed, 166 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3900-drm-amd-pp-Refine-register_thermal_interrupt-functio.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3900-drm-amd-pp-Refine-register_thermal_interrupt-functio.patch
new file mode 100644
index 00000000..be0f0fb5
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3900-drm-amd-pp-Refine-register_thermal_interrupt-functio.patch
@@ -0,0 +1,166 @@
+From a728cddbd3333fa2dbdaf88f73c5174299ad1341 Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Wed, 21 Mar 2018 13:11:27 +0800
+Subject: [PATCH 3900/4131] drm/amd/pp: Refine register_thermal_interrupt
+ function
+
+v2: add Vega12 support
+
+1. delete useless argument in function register_thermal_interrupt
+2. rename function name register_thermal_interrupt to register_irq_handlers
+
+Change-Id: I85d6263f2b18e4f97a45bbdef32fd1ffbff02abe
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 6 +++---
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 ++---
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 3 +--
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 3 +--
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 +--
+ 9 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+index b784131..ae2e933 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+@@ -202,12 +202,12 @@ int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr)
+ return hwmgr->hwmgr_func->stop_thermal_controller(hwmgr);
+ }
+
+-int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info)
++int phm_register_irq_handlers(struct pp_hwmgr *hwmgr)
+ {
+ PHM_FUNC_CHECK(hwmgr);
+
+- if (hwmgr->hwmgr_func->register_internal_thermal_interrupt != NULL)
+- return hwmgr->hwmgr_func->register_internal_thermal_interrupt(hwmgr, info);
++ if (hwmgr->hwmgr_func->register_irq_handlers != NULL)
++ return hwmgr->hwmgr_func->register_irq_handlers(hwmgr);
+
+ return 0;
+ }
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+index ce581ae..bafcfd2 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+@@ -206,7 +206,7 @@ int hwmgr_hw_init(struct pp_hwmgr *hwmgr)
+ if (ret)
+ goto err2;
+
+- ret = phm_register_thermal_interrupt(hwmgr, NULL);
++ ret = phm_register_irq_handlers(hwmgr);
+ if (ret)
+ goto err2;
+
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+index 892bbee..73cc076 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+@@ -3995,8 +3995,7 @@ static int smu7_set_max_fan_rpm_output(struct pp_hwmgr *hwmgr, uint16_t us_max_f
+ PPSMC_MSG_SetFanRpmMax, us_max_fan_rpm);
+ }
+
+-static int smu7_register_internal_thermal_interrupt(struct pp_hwmgr *hwmgr,
+- const void *thermal_interrupt_info)
++static int smu7_register_irq_handlers(struct pp_hwmgr *hwmgr)
+ {
+ return 0;
+ }
+@@ -4981,7 +4980,7 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
+ .get_fan_speed_rpm = smu7_fan_ctrl_get_fan_speed_rpm,
+ .set_fan_speed_rpm = smu7_fan_ctrl_set_fan_speed_rpm,
+ .uninitialize_thermal_controller = smu7_thermal_ctrl_uninitialize_thermal_controller,
+- .register_internal_thermal_interrupt = smu7_register_internal_thermal_interrupt,
++ .register_irq_handlers = smu7_register_irq_handlers,
+ .check_smc_update_required_for_display_configuration = smu7_check_smc_update_required_for_display_configuration,
+ .check_states_equal = smu7_check_states_equal,
+ .set_fan_control_mode = smu7_set_fan_control_mode,
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
+index 1f6d481..5981228 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
+@@ -581,8 +581,7 @@ static const struct amdgpu_irq_src_funcs smu9_irq_funcs = {
+ .process = phm_irq_process,
+ };
+
+-int smu9_register_thermal_interrupt(struct pp_hwmgr *hwmgr,
+- const void *info)
++int smu9_register_irq_handlers(struct pp_hwmgr *hwmgr)
+ {
+ struct amdgpu_irq_src *source =
+ kzalloc(sizeof(struct amdgpu_irq_src), GFP_KERNEL);
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
+index 6a43a2a..6429dc2 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
+@@ -77,8 +77,7 @@ int phm_irq_process(struct amdgpu_device *adev,
+ struct amdgpu_irq_src *source,
+ struct amdgpu_iv_entry *entry);
+
+-int smu9_register_thermal_interrupt(struct pp_hwmgr *hwmgr,
+- const void *info);
++int smu9_register_irq_handlers(struct pp_hwmgr *hwmgr);
+
+ #define PHM_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
+ #define PHM_FIELD_MASK(reg, field) reg##__##field##_MASK
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+index a3e86da..a0c2651 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+@@ -4938,7 +4938,7 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
+ .avfs_control = vega10_avfs_enable,
+ .notify_cac_buffer_info = vega10_notify_cac_buffer_info,
+ .get_thermal_temperature_range = vega10_get_thermal_temperature_range,
+- .register_internal_thermal_interrupt = smu9_register_thermal_interrupt,
++ .register_irq_handlers = smu9_register_irq_handlers,
+ .start_thermal_controller = vega10_start_thermal_controller,
+ .get_power_profile_mode = vega10_get_power_profile_mode,
+ .set_power_profile_mode = vega10_set_power_profile_mode,
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+index fd27b49..cdacdd15 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+@@ -2565,7 +2565,7 @@ static const struct pp_hwmgr_func vega12_hwmgr_funcs = {
+ #endif
+ .notify_cac_buffer_info = vega12_notify_cac_buffer_info,
+ .get_thermal_temperature_range = vega12_get_thermal_temperature_range,
+- .register_internal_thermal_interrupt = smu9_register_thermal_interrupt,
++ .register_irq_handlers = smu9_register_irq_handlers,
+ .start_thermal_controller = vega12_start_thermal_controller,
+ };
+
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+index 19f2e43..8b78bbe 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+@@ -417,7 +417,7 @@ extern int phm_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,
+ extern int phm_force_dpm_levels(struct pp_hwmgr *hwmgr, enum amd_dpm_forced_level level);
+ extern int phm_display_configuration_changed(struct pp_hwmgr *hwmgr);
+ extern int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr);
+-extern int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info);
++extern int phm_register_irq_handlers(struct pp_hwmgr *hwmgr);
+ extern int phm_start_thermal_controller(struct pp_hwmgr *hwmgr);
+ extern int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr);
+ extern bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr);
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+index 985fe8d..d742d9d 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+@@ -287,8 +287,7 @@ struct pp_hwmgr_func {
+ int (*get_fan_speed_rpm)(struct pp_hwmgr *hwmgr, uint32_t *speed);
+ int (*reset_fan_speed_to_default)(struct pp_hwmgr *hwmgr);
+ int (*uninitialize_thermal_controller)(struct pp_hwmgr *hwmgr);
+- int (*register_internal_thermal_interrupt)(struct pp_hwmgr *hwmgr,
+- const void *thermal_interrupt_info);
++ int (*register_irq_handlers)(struct pp_hwmgr *hwmgr);
+ bool (*check_smc_update_required_for_display_configuration)(struct pp_hwmgr *hwmgr);
+ int (*check_states_equal)(struct pp_hwmgr *hwmgr,
+ const struct pp_hw_power_state *pstate1,
+--
+2.7.4
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 12:55:56 +0000