diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0103-drm-amd-powerplay-export-interface-to-DAL-to-init-ch.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0103-drm-amd-powerplay-export-interface-to-DAL-to-init-ch.patch | 126 |
1 files changed, 0 insertions, 126 deletions
diff --git a/common/recipes-kernel/linux/files/0103-drm-amd-powerplay-export-interface-to-DAL-to-init-ch.patch b/common/recipes-kernel/linux/files/0103-drm-amd-powerplay-export-interface-to-DAL-to-init-ch.patch deleted file mode 100644 index 4e430c18..00000000 --- a/common/recipes-kernel/linux/files/0103-drm-amd-powerplay-export-interface-to-DAL-to-init-ch.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 3e6b314855a8e00aafadac9d3ff828e5de0fe713 Mon Sep 17 00:00:00 2001 -From: Rex Zhu <Rex.Zhu@amd.com> -Date: Thu, 19 Nov 2015 13:35:30 +0800 -Subject: [PATCH 0103/1110] drm/amd/powerplay: export interface to DAL to - init/change display configuration. - -Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> -Signed-off-by: David Rokhvarg <David.Rokhvarg@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + - drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 16 ++++++++++++++++ - drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 16 ++++++++++++++++ - drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 9 +++++++++ - drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 3 +++ - 5 files changed, 45 insertions(+) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 4a4ddb6..4084669 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1647,6 +1647,7 @@ struct amdgpu_pm { - const struct amdgpu_dpm_funcs *funcs; - uint32_t pcie_gen_mask; - uint32_t pcie_mlw_mask; -+ struct amd_pp_display_configuration pm_display_cfg;/* set by DAL */ - }; - - void amdgpu_get_pcie_info(struct amdgpu_device *adev); -diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c -index 10385c0..215757e 100644 ---- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c -+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c -@@ -603,3 +603,19 @@ int amd_powerplay_fini(void *handle) - - return 0; - } -+ -+/* export this function to DAL */ -+ -+int amd_powerplay_display_configuration_change(void *handle, const void *input) -+{ -+ struct pp_hwmgr *hwmgr; -+ const struct amd_pp_display_configuration *display_config = input; -+ -+ if (handle == NULL) -+ return -EINVAL; -+ -+ hwmgr = ((struct pp_instance *)handle)->hwmgr; -+ -+ phm_store_dal_configuration_data(hwmgr, display_config); -+ return 0; -+} -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c -index f2d603c..d6d2849 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c -@@ -26,6 +26,7 @@ - #include "power_state.h" - #include "pp_acpi.h" - #include "amd_acpi.h" -+#include "amd_powerplay.h" - - void phm_init_dynamic_caps(struct pp_hwmgr *hwmgr) - { -@@ -244,3 +245,18 @@ int phm_check_states_equal(struct pp_hwmgr *hwmgr, - - return hwmgr->hwmgr_func->check_states_equal(hwmgr, pstate1, pstate2, equal); - } -+ -+int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, -+ const struct amd_pp_display_configuration *display_config) -+{ -+ if (hwmgr == NULL || hwmgr->hwmgr_func->store_cc6_data == NULL) -+ return -EINVAL; -+ -+ /* to do pass other display configuration in furture */ -+ return hwmgr->hwmgr_func->store_cc6_data(hwmgr, -+ display_config->cpu_pstate_separation_time, -+ display_config->cpu_cc6_disable, -+ display_config->cpu_pstate_disable, -+ display_config->nb_pstate_switch_disable); -+ -+} -diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h -index 40ded67..efa23c1 100644 ---- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h -+++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h -@@ -131,6 +131,13 @@ struct amd_pp_init { - uint32_t rev_id; - }; - -+struct amd_pp_display_configuration { -+ bool nb_pstate_switch_disable;/* controls NB PState switch */ -+ bool cpu_cc6_disable; /* controls CPU CState switch ( on or off) */ -+ bool cpu_pstate_disable; -+ uint32_t cpu_pstate_separation_time; -+}; -+ - enum { - PP_GROUP_UNKNOWN = 0, - PP_GROUP_GFX = 1, -@@ -203,4 +210,6 @@ int amd_powerplay_init(struct amd_pp_init *pp_init, - struct amd_powerplay *amd_pp); - int amd_powerplay_fini(void *handle); - -+int amd_powerplay_display_configuration_change(void *handle, const void *input); -+ - #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 a3f7bd2..7b721e8 100644 ---- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h -+++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h -@@ -353,5 +353,8 @@ extern int phm_check_states_equal(struct pp_hwmgr *hwmgr, - const struct pp_hw_power_state *pstate2, - bool *equal); - -+extern int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, -+ const struct amd_pp_display_configuration *display_config); -+ - #endif /* _HARDWARE_MANAGER_H_ */ - --- -2.7.4 - |