diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3522-drm-amd-powerplay-init-smu-tables-for-rn.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3522-drm-amd-powerplay-init-smu-tables-for-rn.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3522-drm-amd-powerplay-init-smu-tables-for-rn.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3522-drm-amd-powerplay-init-smu-tables-for-rn.patch new file mode 100644 index 00000000..b8348ab4 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3522-drm-amd-powerplay-init-smu-tables-for-rn.patch @@ -0,0 +1,106 @@ +From d77323c16f263db2a0d2135285d2bcbae899dcf5 Mon Sep 17 00:00:00 2001 +From: Aaron Liu <aaron.liu@amd.com> +Date: Tue, 30 Jul 2019 11:04:58 +0800 +Subject: [PATCH 3522/4256] drm/amd/powerplay: init smu tables for rn + +Initialize smu tables for renoir: +WATERMARKS/DPMCLOCKS/SMU_METRICS + +Signed-off-by: Aaron Liu <aaron.liu@amd.com> +Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> +Reviewed-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Kevin Wang <kevin1.wang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 16 +++++++++++ + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 32 ++++++++++++++++++++++ + 2 files changed, 48 insertions(+) + +diff --git a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c +index 7c3dc150eaa3..c8e0d79de43e 100644 +--- a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c +@@ -138,14 +138,30 @@ static int renoir_get_smu_table_index(struct smu_context *smc, uint32_t index) + return mapping.map_to; + } + ++static int renoir_tables_init(struct smu_context *smu, struct smu_table *tables) ++{ ++ SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t), ++ PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM); ++ SMU_TABLE_INIT(tables, SMU_TABLE_DPMCLOCKS, sizeof(DpmClocks_t), ++ PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM); ++ SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t), ++ PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM); ++ ++ return 0; ++} ++ + static const struct pptable_funcs renoir_ppt_funcs = { + .get_smu_msg_index = renoir_get_smu_msg_index, + .get_smu_table_index = renoir_get_smu_table_index, ++ .tables_init = renoir_tables_init, + .set_power_state = NULL, + }; + + void renoir_set_ppt_funcs(struct smu_context *smu) + { ++ struct smu_table_context *smu_table = &smu->smu_table; ++ + smu->ppt_funcs = &renoir_ppt_funcs; + smu->smc_if_version = SMU12_DRIVER_IF_VERSION; ++ smu_table->table_count = TABLE_COUNT; + } +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c +index 363a5a76b6a6..76a6c4b7b63c 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c +@@ -270,6 +270,36 @@ static int smu_v12_0_gfx_off_control(struct smu_context *smu, bool enable) + return ret; + } + ++static int smu_v12_0_init_smc_tables(struct smu_context *smu) ++{ ++ struct smu_table_context *smu_table = &smu->smu_table; ++ struct smu_table *tables = NULL; ++ ++ if (smu_table->tables || smu_table->table_count == 0) ++ return -EINVAL; ++ ++ tables = kcalloc(SMU_TABLE_COUNT, sizeof(struct smu_table), ++ GFP_KERNEL); ++ if (!tables) ++ return -ENOMEM; ++ ++ smu_table->tables = tables; ++ ++ return smu_tables_init(smu, tables); ++} ++ ++static int smu_v12_0_fini_smc_tables(struct smu_context *smu) ++{ ++ struct smu_table_context *smu_table = &smu->smu_table; ++ ++ if (!smu_table->tables || smu_table->table_count == 0) ++ return -EINVAL; ++ ++ kfree(smu_table->tables); ++ smu_table->tables = NULL; ++ ++ return 0; ++} + static const struct smu_funcs smu_v12_0_funcs = { + .check_fw_status = smu_v12_0_check_fw_status, + .check_fw_version = smu_v12_0_check_fw_version, +@@ -280,6 +310,8 @@ static const struct smu_funcs smu_v12_0_funcs = { + .read_smc_arg = smu_v12_0_read_arg, + .set_gfx_cgpg = smu_v12_0_set_gfx_cgpg, + .gfx_off_control = smu_v12_0_gfx_off_control, ++ .init_smc_tables = smu_v12_0_init_smc_tables, ++ .fini_smc_tables = smu_v12_0_fini_smc_tables, + }; + + void smu_v12_0_set_smu_funcs(struct smu_context *smu) +-- +2.17.1 + |