diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1377-drm-amd-powerplay-add-function-to-check-pptable-for-.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1377-drm-amd-powerplay-add-function-to-check-pptable-for-.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1377-drm-amd-powerplay-add-function-to-check-pptable-for-.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1377-drm-amd-powerplay-add-function-to-check-pptable-for-.patch new file mode 100644 index 00000000..48810aed --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1377-drm-amd-powerplay-add-function-to-check-pptable-for-.patch @@ -0,0 +1,103 @@ +From ee1308b2e0a38761fe27e307ece5f978eade647f Mon Sep 17 00:00:00 2001 +From: Likun Gao <Likun.Gao@amd.com> +Date: Fri, 14 Dec 2018 16:18:21 +0800 +Subject: [PATCH 1377/2940] drm/amd/powerplay: add function to check pptable + for smu11 + +Add smu_v11_0_check_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 | 9 ++++++++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 21 +++++++++++++++++++ + 3 files changed, 33 insertions(+) + +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index c6774e35280a..a034a15cdbce 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -102,6 +102,7 @@ struct smu_context + + struct pptable_funcs { + int (*store_powerplay_table)(struct smu_context *smu); ++ int (*check_powerplay_table)(struct smu_context *smu); + }; + + struct smu_funcs +@@ -180,6 +181,8 @@ struct smu_funcs + ((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) ++#define smu_check_powerplay_table(smu) \ ++ ((smu)->ppt_funcs->check_powerplay_table ? (smu)->ppt_funcs->check_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 826fd6e9b007..f24cd7da97e0 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -486,6 +486,14 @@ static int smu_v11_0_notify_memory_pool_location(struct smu_context *smu) + return ret; + } + ++static int smu_v11_0_check_pptable(struct smu_context *smu) ++{ ++ int ret; ++ ++ ret = smu_check_powerplay_table(smu); ++ return ret; ++} ++ + static int smu_v11_0_parse_pptable(struct smu_context *smu) + { + int ret; +@@ -520,6 +528,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, ++ .check_pptable = smu_v11_0_check_pptable, + .parse_pptable = smu_v11_0_parse_pptable, + }; + +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +index 292f18c0c90d..7bc3e4ec3414 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +@@ -52,8 +52,29 @@ static int vega20_store_powerplay_table(struct smu_context *smu) + return 0; + } + ++static int vega20_check_powerplay_table(struct smu_context *smu) ++{ ++ ATOM_Vega20_POWERPLAYTABLE *powerplay_table = NULL; ++ struct smu_table_context *table_context = &smu->smu_table; ++ ++ powerplay_table = table_context->power_play_table; ++ ++ if (powerplay_table->sHeader.format_revision < ATOM_VEGA20_TABLE_REVISION_VEGA20) { ++ pr_err("Unsupported PPTable format!"); ++ return -EINVAL; ++ } ++ ++ if (!powerplay_table->sHeader.structuresize) { ++ pr_err("Invalid PowerPlay Table!"); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ + static const struct pptable_funcs vega20_ppt_funcs = { + .store_powerplay_table = vega20_store_powerplay_table, ++ .check_powerplay_table = vega20_check_powerplay_table, + }; + + void vega20_set_ppt_funcs(struct smu_context *smu) +-- +2.17.1 + |