[PATCH 1/2] drm/amd/amdgpu: fix psp tmr bo pin count leak in SRIOV

2021-12-13 Thread Jingwen Chen 
[Why]
psp tmr bo will be pinned during loading amdgpu and reset in SRIOV while
only unpinned in unload amdgpu

[How]
add amdgpu_in_reset and sriov judgement to skip pin bo

Signed-off-by: Jingwen Chen 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 103bcadbc8b8..cf5baa57ab95 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2017,12 +2017,16 @@ static int psp_hw_start(struct psp_context *psp)
return ret;
}
 
+   if (amdgpu_sriov_vf(adev) && !amdgpu_in_reset(adev)) 
+   goto skip_pin_bo;
+
ret = psp_tmr_init(psp);
if (ret) {
DRM_ERROR("PSP tmr init failed!\n");
return ret;
}
 
+skip_pin_bo:
/*
 * For ASICs with DF Cstate management centralized
 * to PMFW, TMR setup should be performed after PMFW
-- 
2.30.2

[PATCH 1/2] drm/amd/amdgpu: fix psp tmr bo pin count leak in SRIOV

2021-12-13 Thread Jingwen Chen 
[Why]
psp tmr bo will be pinned during loading amdgpu and reset in SRIOV while
only unpinned in unload amdgpu

[How]
add amdgpu_in_reset and sriov judgement for psp_tmr_init

Signed-off-by: Jingwen Chen 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 103bcadbc8b8..19c026c47c96 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2017,13 +2017,14 @@ static int psp_hw_start(struct psp_context *psp)
return ret;
}
 
-   ret = psp_tmr_init(psp);
-   if (ret) {
-   DRM_ERROR("PSP tmr init failed!\n");
-   return ret;
+   if (amdgpu_sriov_vf(adev) && !amdgpu_in_reset(adev)) {
+   ret = psp_tmr_init(psp);
+   if (ret) {
+   DRM_ERROR("PSP tmr init failed!\n");
+   goto failed;
+   }
}
 
-   /*
 * For ASICs with DF Cstate management centralized
 * to PMFW, TMR setup should be performed after PMFW
 * loaded and before other non-psp firmware loaded.
-- 
2.30.2