diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2883-drm-amd-powerplay-Use-proper-enums-in-vega20_print_c.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2883-drm-amd-powerplay-Use-proper-enums-in-vega20_print_c.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2883-drm-amd-powerplay-Use-proper-enums-in-vega20_print_c.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2883-drm-amd-powerplay-Use-proper-enums-in-vega20_print_c.patch new file mode 100644 index 00000000..ff917fca --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2883-drm-amd-powerplay-Use-proper-enums-in-vega20_print_c.patch @@ -0,0 +1,70 @@ +From c120dcc1c7573d2a5fe979c8d30bcea63f1ba3d6 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor <natechancellor@gmail.com> +Date: Wed, 3 Jul 2019 22:52:17 -0700 +Subject: [PATCH 2883/2940] drm/amd/powerplay: Use proper enums in + vega20_print_clk_levels + +clang warns: + +drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:995:39: warning: +implicit conversion from enumeration type 'PPCLK_e' to different +enumeration type 'enum smu_clk_type' [-Wenum-conversion] + ret = smu_get_current_clk_freq(smu, PPCLK_SOCCLK, &now); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~ +drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:1016:39: warning: +implicit conversion from enumeration type 'PPCLK_e' to different +enumeration type 'enum smu_clk_type' [-Wenum-conversion] + ret = smu_get_current_clk_freq(smu, PPCLK_FCLK, &now); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ +drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:1031:39: warning: +implicit conversion from enumeration type 'PPCLK_e' to different +enumeration type 'enum smu_clk_type' [-Wenum-conversion] + ret = smu_get_current_clk_freq(smu, PPCLK_DCEFCLK, &now); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ + +The values are mapped one to one in vega20_get_smu_clk_index so just use +the proper enums here. + +Fixes: 096761014227 ("drm/amd/powerplay: support sysfs to get socclk, fclk, dcefclk") +Link: https://github.com/ClangBuiltLinux/linux/issues/587 +Reviewed-by: Evan Quan <evan.quan@amd.com> +Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +index 1fc367307ac0..2a299f708cd7 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +@@ -992,7 +992,7 @@ static int vega20_print_clk_levels(struct smu_context *smu, + break; + + case SMU_SOCCLK: +- ret = smu_get_current_clk_freq(smu, PPCLK_SOCCLK, &now); ++ ret = smu_get_current_clk_freq(smu, SMU_SOCCLK, &now); + if (ret) { + pr_err("Attempt to get current socclk Failed!"); + return ret; +@@ -1013,7 +1013,7 @@ static int vega20_print_clk_levels(struct smu_context *smu, + break; + + case SMU_FCLK: +- ret = smu_get_current_clk_freq(smu, PPCLK_FCLK, &now); ++ ret = smu_get_current_clk_freq(smu, SMU_FCLK, &now); + if (ret) { + pr_err("Attempt to get current fclk Failed!"); + return ret; +@@ -1028,7 +1028,7 @@ static int vega20_print_clk_levels(struct smu_context *smu, + break; + + case SMU_DCEFCLK: +- ret = smu_get_current_clk_freq(smu, PPCLK_DCEFCLK, &now); ++ ret = smu_get_current_clk_freq(smu, SMU_DCEFCLK, &now); + if (ret) { + pr_err("Attempt to get current dcefclk Failed!"); + return ret; +-- +2.17.1 + |