diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1376-drm-amd-powerplay-add-function-to-parse-pptable-for-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1376-drm-amd-powerplay-add-function-to-parse-pptable-for-.patch | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1376-drm-amd-powerplay-add-function-to-parse-pptable-for-.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1376-drm-amd-powerplay-add-function-to-parse-pptable-for-.patch new file mode 100644 index 00000000..1c63cb29 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1376-drm-amd-powerplay-add-function-to-parse-pptable-for-.patch @@ -0,0 +1,102 @@ +From ef5bba36c92e30cd2a3e948ae76a4b84f1bc3d0a Mon Sep 17 00:00:00 2001 +From: Likun Gao <Likun.Gao@amd.com> +Date: Tue, 18 Dec 2018 22:56:48 +0800 +Subject: [PATCH 1376/2940] drm/amd/powerplay: add function to parse pptable + for smu11 + +Add smu_v11_0_parse_pptable function for smu11. + +Signed-off-by: Likun Gao <Likun.Gao@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Reviewed-by: Kevin Wang <Kevin1.Wang@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +++ + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 20 +++++++++++++++++++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 11 ++++++++++ + 3 files changed, 34 insertions(+) + +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index 437d0ada16b6..c6774e35280a 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -70,6 +70,7 @@ struct smu_table_context + uint32_t power_play_table_size; + + struct smu_bios_boot_up_values boot_values; ++ void *driver_pptable; + struct smu_table *tables; + uint32_t table_count; + struct smu_table memory_pool; +@@ -177,6 +178,8 @@ struct smu_funcs + ((smu)->funcs->send_smc_msg? (smu)->funcs->send_smc_msg((smu), (msg)) : 0) + #define smu_send_smc_msg_with_param(smu, msg, param) \ + ((smu)->funcs->send_smc_msg_with_param? (smu)->funcs->send_smc_msg_with_param((smu), (msg), (param)) : 0) ++#define smu_store_powerplay_table(smu) \ ++ ((smu)->ppt_funcs->store_powerplay_table ? (smu)->ppt_funcs->store_powerplay_table((smu)) : 0) + + extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table, + uint16_t *size, uint8_t *frev, uint8_t *crev, +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index 65e5641d5299..826fd6e9b007 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -486,6 +486,25 @@ static int smu_v11_0_notify_memory_pool_location(struct smu_context *smu) + return ret; + } + ++static int smu_v11_0_parse_pptable(struct smu_context *smu) ++{ ++ int ret; ++ ++ struct smu_table_context *table_context = &smu->smu_table; ++ ++ if (table_context->driver_pptable) ++ return -EINVAL; ++ ++ table_context->driver_pptable = kzalloc(sizeof(PPTable_t), GFP_KERNEL); ++ ++ if (!table_context->driver_pptable) ++ return -ENOMEM; ++ ++ ret = smu_store_powerplay_table(smu); ++ ++ return ret; ++} ++ + static const struct smu_funcs smu_v11_0_funcs = { + .init_microcode = smu_v11_0_init_microcode, + .load_microcode = smu_v11_0_load_microcode, +@@ -501,6 +520,7 @@ static const struct smu_funcs smu_v11_0_funcs = { + .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, + .get_clk_info_from_vbios = smu_v11_0_get_clk_info_from_vbios, + .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, ++ .parse_pptable = smu_v11_0_parse_pptable, + }; + + void smu_v11_0_set_smu_funcs(struct smu_context *smu) +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +index 7522cc7edd43..292f18c0c90d 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +@@ -38,6 +38,17 @@ + + static int vega20_store_powerplay_table(struct smu_context *smu) + { ++ ATOM_Vega20_POWERPLAYTABLE *powerplay_table = NULL; ++ struct smu_table_context *table_context = &smu->smu_table; ++ ++ if (!table_context->power_play_table) ++ return -EINVAL; ++ ++ powerplay_table = table_context->power_play_table; ++ ++ memcpy(table_context->driver_pptable, &powerplay_table->smcPPTable, ++ sizeof(PPTable_t)); ++ + return 0; + } + +-- +2.17.1 + |