Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Christophe JAILLET and committed by
Alex Deucher
a3300782 fcb600b0

+3 -2
+3 -2
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c
··· 1120 1120 result = vega10_program_didt_config_registers(hwmgr, SEEDCForceStallPatternConfig_Vega10, VEGA10_CONFIGREG_DIDT); 1121 1121 result |= vega10_program_didt_config_registers(hwmgr, SEEDCCtrlForceStallConfig_Vega10, VEGA10_CONFIGREG_DIDT); 1122 1122 if (0 != result) 1123 - return result; 1123 + goto exit_safe_mode; 1124 1124 1125 1125 vega10_didt_set_mask(hwmgr, false); 1126 1126 1127 + exit_safe_mode: 1127 1128 amdgpu_gfx_rlc_exit_safe_mode(adev, 0); 1128 1129 1129 - return 0; 1130 + return result; 1130 1131 } 1131 1132 1132 1133 static int vega10_disable_se_edc_force_stall_config(struct pp_hwmgr *hwmgr)