diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4086-drm-amd-pp-Fix-static-checker-warning.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4086-drm-amd-pp-Fix-static-checker-warning.patch | 112 |
1 files changed, 112 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4086-drm-amd-pp-Fix-static-checker-warning.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4086-drm-amd-pp-Fix-static-checker-warning.patch new file mode 100644 index 00000000..0976e26d --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4086-drm-amd-pp-Fix-static-checker-warning.patch @@ -0,0 +1,112 @@ +From 225045e15168430833bc5daf6ad9163d96d25fd0 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Fri, 18 May 2018 14:24:44 +0800 +Subject: [PATCH 4086/4131] drm/amd/pp: Fix static checker warning + +error: uninitialized symbol 'xxxx' + +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 24 +++++++++------------- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 ++- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 ++---- + 3 files changed, 14 insertions(+), 19 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +index d58be7e..f591b68 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +@@ -1073,10 +1073,8 @@ int atomctrl_get_voltage_evv_on_sclk( + GetIndexIntoMasterTable(COMMAND, GetVoltageInfo), + (uint32_t *)&get_voltage_info_param_space); + +- if (0 != result) +- return result; +- +- *voltage = le16_to_cpu(((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_2 *) ++ *voltage = result ? 0 : ++ le16_to_cpu(((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_2 *) + (&get_voltage_info_param_space))->usVoltageLevel); + + return result; +@@ -1281,8 +1279,7 @@ int atomctrl_read_efuse(struct pp_hwmgr *hwmgr, uint16_t start_index, + result = amdgpu_atom_execute_table(adev->mode_info.atom_context, + GetIndexIntoMasterTable(COMMAND, ReadEfuseValue), + (uint32_t *)&efuse_param); +- if (!result) +- *efuse = le32_to_cpu(efuse_param.ulEfuseValue) & mask; ++ *efuse = result ? 0 : le32_to_cpu(efuse_param.ulEfuseValue) & mask; + + return result; + } +@@ -1323,11 +1320,8 @@ int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_ + GetIndexIntoMasterTable(COMMAND, GetVoltageInfo), + (uint32_t *)&get_voltage_info_param_space); + +- if (0 != result) +- return result; +- +- *voltage = le32_to_cpu(((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_3 *) +- (&get_voltage_info_param_space))->ulVoltageLevel); ++ *voltage = result ? 0 : ++ le32_to_cpu(((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_3 *)(&get_voltage_info_param_space))->ulVoltageLevel); + + return result; + } +@@ -1521,15 +1515,17 @@ void atomctrl_get_voltage_range(struct pp_hwmgr *hwmgr, uint32_t *max_vddc, + case CHIP_FIJI: + *max_vddc = le32_to_cpu(((ATOM_ASIC_PROFILING_INFO_V3_3 *)profile)->ulMaxVddc/4); + *min_vddc = le32_to_cpu(((ATOM_ASIC_PROFILING_INFO_V3_3 *)profile)->ulMinVddc/4); +- break; ++ return; + case CHIP_POLARIS11: + case CHIP_POLARIS10: + case CHIP_POLARIS12: + *max_vddc = le32_to_cpu(((ATOM_ASIC_PROFILING_INFO_V3_6 *)profile)->ulMaxVddc/100); + *min_vddc = le32_to_cpu(((ATOM_ASIC_PROFILING_INFO_V3_6 *)profile)->ulMinVddc/100); +- break; +- default: + return; ++ default: ++ break; + } + } ++ *max_vddc = 0; ++ *min_vddc = 0; + } +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +index 2fa9531..f1dabd7 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +@@ -845,7 +845,8 @@ static void smu7_setup_voltage_range_from_vbios(struct pp_hwmgr *hwmgr) + struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table; + struct phm_ppt_v1_information *table_info = + (struct phm_ppt_v1_information *)(hwmgr->pptable); +- uint32_t min_vddc, max_vddc; ++ uint32_t min_vddc = 0; ++ uint32_t max_vddc = 0; + + if (!table_info) + return; +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +index 64d33b7..d644a9b 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +@@ -283,11 +283,9 @@ int smu7_read_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr, uint32_t + + result = smu7_set_smc_sram_address(hwmgr, smc_addr, limit); + +- if (result) +- return result; ++ *value = result ? 0 : cgs_read_register(hwmgr->device, mmSMC_IND_DATA_11); + +- *value = cgs_read_register(hwmgr->device, mmSMC_IND_DATA_11); +- return 0; ++ return result; + } + + int smu7_write_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr, uint32_t value, uint32_t limit) +-- +2.7.4 + |