drm/amd/pm: fix unchecked return value warning for vega10_hwmgr
Subsystems (3)
PATCH 1/4 drm/amd/pm: fix unchecked return value warning for vega10_hwmgr
This resolves the unchecked return value warning reported by Coverity.
--- drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1 -3
@@ -2934,9 +2934,7 @@ static int vega10_stop_dpm(struct pp_hwmgr *hwmgr, uint32_t bitmap) } } -vega10_enable_smc_features (hwmgr, false, feature_mask); - -return 0 ; +return vega10_enable_smc_features (hwmgr, false, feature_mask); }/**
Signature · 1 line
2.43.0
PATCH 2/4 drm/amdgpu: fix unchecked return value warning for amdgpu_gfx
This resolves the unchecded return value warning reported by Coverity.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +14 -4
@@ -860,8 +860,11 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *rint r;if (amdgpu_ras_is_supported (adev, ras_block->block)) { -if (!amdgpu_persistent_edc_harvesting_supported (adev)) -amdgpu_ras_reset_error_status (adev,AMDGPU_RAS_BLOCK__GFX ); +if (!amdgpu_persistent_edc_harvesting_supported (adev)) { + r =amdgpu_ras_reset_error_status (adev,AMDGPU_RAS_BLOCK__GFX ); +if (r) +return r; + } r =amdgpu_ras_block_late_init (adev, ras_block);if (r)
@@ -1005,7 +1008,10 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t xcc_pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); + r =amdgpu_ring_alloc (ring,32 ); +if (r) + goto failed_unlock; +amdgpu_ring_emit_rreg (ring, reg, reg_val_offs); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)
@@ -1071,7 +1077,10 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); + r =amdgpu_ring_alloc (ring,32 ); +if (r) + goto failed_unlock; +amdgpu_ring_emit_wreg (ring, reg, v); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)
@@ -1107,6 +1116,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 failed_undo:amdgpu_ring_undo (ring); +failed_unlock:spin_unlock_irqrestore (&kiq->ring_lock, flags); failed_kiq_write:dev_err (adev->dev,"failed to write reg:%x\n" , reg);
Signature · 1 line
2.43.0
PATCH 3/4 drm/amdgpu: fix unchecked return value warning for amdgpu_atombios
In reply to Tim HuangThis resolves the unchecded return value warning reported by Coverity.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 35 ++++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +21 -14
@@ -1018,8 +1018,9 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,if (clock_type ==COMPUTE_ENGINE_PLL_PARAM ) { args.v3.ulClockParams =cpu_to_le32 ((clock_type <<24 ) | clock); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; dividers->post_div = args.v3.ucPostDiv; dividers->enable_post_div = (args.v3.ucCntlFlag &
@@ -1039,8 +1040,9 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,if (strobe_mode) args.v5.ucInputFlag =ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; dividers->post_div = args.v5.ucPostDiv; dividers->enable_post_div = (args.v5.ucCntlFlag &
@@ -1058,8 +1060,9 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,/* fusion */ args.v4.ulClock =cpu_to_le32 (clock);/* 10 khz */ -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; dividers->post_divider = dividers->post_div = args.v4.ucPostDiv; dividers->real_clock =le32_to_cpu (args.v4.ulClock);
@@ -1070,8 +1073,9 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev, args.v6_in.ulClock.ulComputeClockFlag = clock_type; args.v6_in.ulClock.ulClockFreq =cpu_to_le32 (clock);/* 10 khz */ -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; dividers->whole_fb_div =le16_to_cpu (args.v6_out.ulFbDiv.usFbDiv); dividers->frac_fb_div =le16_to_cpu (args.v6_out.ulFbDiv.usFbDivFrac);
@@ -1113,8 +1117,9 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,if (strobe_mode) args.ucInputFlag |=MPLL_INPUT_FLAG_STROBE_MODE_EN ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; mpll_param->clkfrac =le16_to_cpu (args.ulFbDiv.usFbDivFrac); mpll_param->clkf =le16_to_cpu (args.ulFbDiv.usFbDiv);
@@ -1211,8 +1216,9 @@ int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type, args.v2.ucVoltageMode =0 ; args.v2.usVoltageLevel =0 ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; *voltage =le16_to_cpu (args.v2.usVoltageLevel);break ;
@@ -1221,8 +1227,9 @@ int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type, args.v3.ucVoltageMode =ATOM_GET_VOLTAGE_LEVEL ; args.v3.usVoltageLevel =cpu_to_le16 (voltage_id); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +if (amdgpu_atom_execute_table (adev->mode_info.atom_context, + index, (uint32_t *)&args,sizeof (args))) +return -EINVAL ; *voltage =le16_to_cpu (args.v3.usVoltageLevel);break ;
Signature · 1 line
2.43.0
PATCH 4/4 drm/amdgpu: check return for setting engine dram timings
In reply to Tim HuangThis resolves the unchecded return value warning reported by Coverity.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 4 ++-- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +4 -4
@@ -1145,8 +1145,8 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,return 0 ; } -void amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, -u32 eng_clock,u32 mem_clock) +int amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, +u32 eng_clock,u32 mem_clock) {SET_ENGINE_CLOCK_PS_ALLOCATION args;int index =GetIndexIntoMasterTable (COMMAND , DynamicMemorySettings);
@@ -1161,8 +1161,8 @@ void amdgpu_atombios_set_engine_dram_timings(struct amdgpu_device *adev,if (mem_clock) args.sReserved.ulClock =cpu_to_le32 (mem_clock &SET_CLOCK_FREQ_MASK ); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, -sizeof (args)); +return amdgpu_atom_execute_table (adev->mode_info.atom_context, index, + (uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_get_default_voltages(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +2 -2
@@ -163,8 +163,8 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,bool strobe_mode, struct atom_mpll_param *mpll_param); -void amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, -u32 eng_clock,u32 mem_clock); +int amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, +u32 eng_clock,u32 mem_clock); bool amdgpu_atombios_is_voltage_gpio(struct amdgpu_device *adev,
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +5 -3
@@ -4755,13 +4755,15 @@ static int si_populate_memory_timing_parameters(struct amdgpu_device *adev,u32 dram_timing;u32 dram_timing2;u32 burst_time; +int ret; arb_regs->mc_arb_rfsh_rate = (u8 )si_calculate_memory_refresh_rate (adev, pl->sclk); -amdgpu_atombios_set_engine_dram_timings (adev, - pl->sclk, - pl->mclk); + ret =amdgpu_atombios_set_engine_dram_timings (adev, pl->sclk, + pl->mclk); +if (ret) +return ret; dram_timing =RREG32 (MC_ARB_DRAM_TIMING ); dram_timing2 =RREG32 (MC_ARB_DRAM_TIMING2 );
Signature · 1 line
2.43.0
RE: [PATCH 4/4] drm/amdgpu: check return for setting engine dram timings
[AMD Official Use Only - AMD Internal Distribution Only]
Series is:
-----Original Message-----
From: Huang, Tim <[email protected]>
Sent: Thursday, August 1, 2024 3:04 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Zhou, Bob <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 4/4] drm/amdgpu: check return for setting engine dram timings
This resolves the unchecded return value warning reported by Coverity.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 4 ++-- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +2 -2
@@ -1145,8 +1145,8 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,return 0 ; } -void amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, -u32 eng_clock,u32 mem_clock) +int amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, +u32 eng_clock,u32 mem_clock) {SET_ENGINE_CLOCK_PS_ALLOCATION args; int index = GetIndexIntoMasterTable(COMMAND, DynamicMemorySettings); @@ -1161,8 +1161,8 @@ void amdgpu_atombios_set_engine_dram_timings(struct amdgpu_device *adev,
if (mem_clock)
args.sReserved.ulClock = cpu_to_le32(mem_clock & SET_CLOCK_FREQ_MASK);- amdgpu_atom_execute_table(adev->mode_info.atom_context, index, (uint32_t *)&args,
- sizeof(args));
+ return amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
+ (uint32_t *)&args, sizeof(args));
}
void amdgpu_atombios_get_default_voltages(struct amdgpu_device *adev, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h
index 0811474e8fd3..0e16432d9a72 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +2 -2
@@ -163,8 +163,8 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,bool strobe_mode, struct atom_mpll_param *mpll_param); -void amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, -u32 eng_clock,u32 mem_clock); +int amdgpu_atombios_set_engine_dram_timings (struct amdgpu_device *adev, +u32 eng_clock,u32 mem_clock);bool amdgpu_atombios_is_voltage_gpio(struct amdgpu_device *adev, diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
index a1baa13ab2c2..43028e776c93 100644
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +5 -3
@@ -4755,13 +4755,15 @@ static int si_populate_memory_timing_parameters(struct amdgpu_device *adev,u32 dram_timing;u32 dram_timing2;u32 burst_time; +int ret; arb_regs->mc_arb_rfsh_rate = (u8 )si_calculate_memory_refresh_rate (adev, pl->sclk); -amdgpu_atombios_set_engine_dram_timings (adev, - pl->sclk, - pl->mclk); + ret =amdgpu_atombios_set_engine_dram_timings (adev, pl->sclk, + pl->mclk); +if (ret) +return ret; dram_timing =RREG32 (MC_ARB_DRAM_TIMING ); dram_timing2 =RREG32 (MC_ARB_DRAM_TIMING2 );
--
2.43.0