aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0286-drm-amd-powerplay-change-struct-name.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0286-drm-amd-powerplay-change-struct-name.patch')
-rw-r--r--common/recipes-kernel/linux/files/0286-drm-amd-powerplay-change-struct-name.patch113
1 files changed, 113 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0286-drm-amd-powerplay-change-struct-name.patch b/common/recipes-kernel/linux/files/0286-drm-amd-powerplay-change-struct-name.patch
new file mode 100644
index 00000000..2044a466
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0286-drm-amd-powerplay-change-struct-name.patch
@@ -0,0 +1,113 @@
+From 9a3e589e2ff9a665fc2d5f9b4ba111ef344bacd2 Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Thu, 10 Dec 2015 16:49:50 +0800
+Subject: [PATCH 0286/1110] drm/amd/powerplay: change struct name.
+
+amd_pp_dal_clock_info to amd_pp_simple_clock_info.
+
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 4 ++--
+ drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 4 ++--
+ drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 +-
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+index bbc6bda..a5d7282 100644
+--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
++++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+@@ -767,7 +767,7 @@ int amd_powerplay_display_configuration_change(void *handle, const void *input)
+ }
+
+ int amd_powerplay_get_display_power_level(void *handle,
+- struct amd_pp_dal_clock_info *output)
++ struct amd_pp_simple_clock_info *output)
+ {
+ struct pp_hwmgr *hwmgr;
+
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+index 1e90cbf..ab0242d 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+@@ -1697,10 +1697,10 @@ static void cz_hw_print_display_cfg(
+ }
+
+ static int cz_get_dal_power_level(struct pp_hwmgr *hwmgr,
+- struct amd_pp_dal_clock_info*info)
++ struct amd_pp_simple_clock_info *info)
+ {
+ uint32_t i;
+- const struct phm_clock_voltage_dependency_table * table =
++ const struct phm_clock_voltage_dependency_table *table =
+ hwmgr->dyn_state.vddc_dep_on_dal_pwrl;
+ const struct phm_clock_and_voltage_limits* limits =
+ &hwmgr->dyn_state.max_clock_voltage_on_ac;
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+index 0f2d5e4..a53d4f2 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+@@ -313,7 +313,7 @@ int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr,
+ }
+
+ int phm_get_dal_power_level(struct pp_hwmgr *hwmgr,
+- struct amd_pp_dal_clock_info *info)
++ struct amd_pp_simple_clock_info *info)
+ {
+ PHM_FUNC_CHECK(hwmgr);
+
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
+index ee23606..3edc2d3 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
+@@ -212,7 +212,7 @@ struct amd_pp_display_configuration {
+ uint32_t dce_tolerable_mclk_in_active_latency;
+ };
+
+-struct amd_pp_dal_clock_info {
++struct amd_pp_simple_clock_info {
+ uint32_t engine_max_clock;
+ uint32_t memory_max_clock;
+ uint32_t level;
+@@ -309,7 +309,7 @@ int amd_powerplay_fini(void *handle);
+ int amd_powerplay_display_configuration_change(void *handle, const void *input);
+
+ int amd_powerplay_get_display_power_level(void *handle,
+- struct amd_pp_dal_clock_info *output);
++ struct amd_pp_simple_clock_info *output);
+
+
+ #endif /* _AMD_POWERPLAY_H_ */
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+index 91795ef..ce97bf2 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+@@ -375,7 +375,7 @@ extern int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr,
+ const struct amd_pp_display_configuration *display_config);
+
+ extern int phm_get_dal_power_level(struct pp_hwmgr *hwmgr,
+- struct amd_pp_dal_clock_info*info);
++ struct amd_pp_simple_clock_info *info);
+
+ extern int phm_set_cpu_power_state(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 4094e81..e3214f1 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+@@ -325,7 +325,7 @@ struct pp_hwmgr_func {
+ bool cc6_disable, bool pstate_disable,
+ bool pstate_switch_disable);
+ int (*get_dal_power_level)(struct pp_hwmgr *hwmgr,
+- struct amd_pp_dal_clock_info *info);
++ struct amd_pp_simple_clock_info *info);
+ int (*power_off_asic)(struct pp_hwmgr *hwmgr);
+ int (*get_pp_table)(struct pp_hwmgr *hwmgr, char **table);
+ int (*set_pp_table)(struct pp_hwmgr *hwmgr, const char *buf, size_t size);
+--
+2.7.4
+