Applied. Thanks!
Alex
On Tue, Nov 19, 2024 at 4:02 PM Christophe JAILLET
<christophe.jaillet@xxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxx>
> ---
> *Not* even compile tested only because of missing "hwmgr.h". I've not
> checked on which arch it is supposed to run in order to cross-compile.
>
> This patch is speculative, review with care!
> ---
> drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 5 +++--
> 1 file 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)
> --
> 2.47.0
>
