diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1460-drm-amd-powerplay-dpm-clk-can-be-set-only-when-perfo.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1460-drm-amd-powerplay-dpm-clk-can-be-set-only-when-perfo.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1460-drm-amd-powerplay-dpm-clk-can-be-set-only-when-perfo.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1460-drm-amd-powerplay-dpm-clk-can-be-set-only-when-perfo.patch new file mode 100644 index 00000000..04bb421e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1460-drm-amd-powerplay-dpm-clk-can-be-set-only-when-perfo.patch @@ -0,0 +1,106 @@ +From 64f332791eab5f3672333b677544a0d53085a21c Mon Sep 17 00:00:00 2001 +From: Likun Gao <Likun.Gao@amd.com> +Date: Wed, 23 Jan 2019 13:37:39 +0800 +Subject: [PATCH 1460/2940] drm/amd/powerplay: dpm clk can be set only when + performance level is manual + +Add condition to make dpm clk can not be set when perfomance level isn't +equal to manual. +Add mutex lock to smu when set dpm clk. + +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> +--- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 31 +++++++++++++--------- + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +index 2833bd8a8078..a90bf77dd9eb 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +@@ -955,7 +955,15 @@ static int vega20_force_clk_levels(struct smu_context *smu, + struct vega20_dpm_table *dpm_table; + struct vega20_single_dpm_table *single_dpm_table; + uint32_t soft_min_level, soft_max_level; +- int ret; ++ struct smu_dpm_context *smu_dpm = &smu->smu_dpm; ++ int ret = 0; ++ ++ if (smu_dpm->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL) { ++ pr_info("force clock level is for dpm manual mode only.\n"); ++ return -EINVAL; ++ } ++ ++ mutex_lock(&(smu->mutex)); + + soft_min_level = mask ? (ffs(mask) - 1) : 0; + soft_max_level = mask ? (fls(mask) - 1) : 0; +@@ -969,7 +977,8 @@ static int vega20_force_clk_levels(struct smu_context *smu, + if (soft_max_level >= single_dpm_table->count) { + pr_err("Clock level specified %d is over max allowed %d\n", + soft_max_level, single_dpm_table->count - 1); +- return -EINVAL; ++ ret = -EINVAL; ++ break; + } + + single_dpm_table->dpm_state.soft_min_level = +@@ -980,14 +989,12 @@ static int vega20_force_clk_levels(struct smu_context *smu, + ret = vega20_upload_dpm_min_level(smu); + if (ret) { + pr_err("Failed to upload boot level to lowest!\n"); +- return ret; ++ break; + } + + ret = vega20_upload_dpm_max_level(smu); +- if (ret) { ++ if (ret) + pr_err("Failed to upload dpm max level to highest!\n"); +- return ret; +- } + + break; + +@@ -997,7 +1004,8 @@ static int vega20_force_clk_levels(struct smu_context *smu, + if (soft_max_level >= single_dpm_table->count) { + pr_err("Clock level specified %d is over max allowed %d\n", + soft_max_level, single_dpm_table->count - 1); +- return -EINVAL; ++ ret = -EINVAL; ++ break; + } + + single_dpm_table->dpm_state.soft_min_level = +@@ -1008,14 +1016,12 @@ static int vega20_force_clk_levels(struct smu_context *smu, + ret = vega20_upload_dpm_min_level(smu); + if (ret) { + pr_err("Failed to upload boot level to lowest!\n"); +- return ret; ++ break; + } + + ret = vega20_upload_dpm_max_level(smu); +- if (ret) { ++ if (ret) + pr_err("Failed to upload dpm max level to highest!\n"); +- return ret; +- } + + break; + +@@ -1026,7 +1032,8 @@ static int vega20_force_clk_levels(struct smu_context *smu, + break; + } + +- return 0; ++ mutex_unlock(&(smu->mutex)); ++ return ret; + } + + static int vega20_get_clock_by_type_with_latency(struct smu_context *smu, +-- +2.17.1 + |