From: YiPeng Chai <[email protected]> Fix driver unload failure when uniras is enabled.
Signed-off-by: YiPeng Chai <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/ras/core/ras_psp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/ras/core/ras_psp.c b/drivers/gpu/drm/amd/ras/core/ras_psp.c index 36d6021afcf76..06668332256c2 100644 --- a/drivers/gpu/drm/amd/ras/core/ras_psp.c +++ b/drivers/gpu/drm/amd/ras/core/ras_psp.c @@ -856,8 +856,6 @@ int ras_psp_sw_fini(struct ras_core_context *ras_core) mutex_destroy(&psp->psp_ctx.internal_mutex); mutex_destroy(&psp->ta_ctx.ta_mutex); - __ras_psp_mem_fini(ras_core); - memset(psp, 0, sizeof(*psp)); return 0; @@ -916,6 +914,7 @@ int ras_psp_hw_init(struct ras_core_context *ras_core) int ras_psp_hw_fini(struct ras_core_context *ras_core) { unload_ras_all_fw(ras_core); + __ras_psp_mem_fini(ras_core); return 0; } -- 2.55.0
