diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2024-11-19 21:23:18 +0100 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2024-12-10 10:26:47 -0500 |
| commit | a3300782d5375e280ba7040f323d01960bfe3396 (patch) | |
| tree | 3211daa4576d9930f349acbdb8aaab8d156ac90b | |
| parent | drm/amdgpu: add interface to get die id from memory address (diff) | |
| download | wireguard-linux-a3300782d5375e280ba7040f323d01960bfe3396.tar.xz wireguard-linux-a3300782d5375e280ba7040f323d01960bfe3396.zip | |
drm/amd/pm: Fix an error handling path in vega10_enable_se_edc_force_stall_config()
In case of error after a amdgpu_gfx_rlc_enter_safe_mode() call, it is not
balanced by a corresponding amdgpu_gfx_rlc_exit_safe_mode() call.
Add the missing call.
Fixes: 9b7b8154cdb8 ("drm/amd/powerplay: added didt support for vega10")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c index 3007b054c873..776d58ea63ae 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c @@ -1120,13 +1120,14 @@ static int vega10_enable_se_edc_force_stall_config(struct pp_hwmgr *hwmgr) result = vega10_program_didt_config_registers(hwmgr, SEEDCForceStallPatternConfig_Vega10, VEGA10_CONFIGREG_DIDT); result |= vega10_program_didt_config_registers(hwmgr, SEEDCCtrlForceStallConfig_Vega10, VEGA10_CONFIGREG_DIDT); if (0 != result) - return result; + goto exit_safe_mode; vega10_didt_set_mask(hwmgr, false); +exit_safe_mode: amdgpu_gfx_rlc_exit_safe_mode(adev, 0); - return 0; + return result; } static int vega10_disable_se_edc_force_stall_config(struct pp_hwmgr *hwmgr) |