diff options
| author |   Huang Rui <ray.huang@amd.com> | 2017-04-10 15:29:42 +0800 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2017-04-28 17:32:12 -0400 |
| commit | b4de2c5aab2d5cd84c2a648d825b0e48ca426e27 (patch) | |
| tree | a8e30761fed60a589b5d374b9abe3177bfe5b2bd /drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | |
| parent | drm/amd/powerplay: fix suspend error on DPM disabled (diff) | |
| download | wireguard-linux-b4de2c5aab2d5cd84c2a648d825b0e48ca426e27.tar.xz wireguard-linux-b4de2c5aab2d5cd84c2a648d825b0e48ca426e27.zip | |
drm/amdgpu: do not free fence buf when driver probes.
Fence buf needs to be used on suspend/resume phase.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 68ccaedad0f7..19180aaa8bf2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -358,8 +358,6 @@ static int psp_load_fw(struct amdgpu_device *adev) if (ret) goto failed_mem; - amdgpu_bo_free_kernel(&psp->fence_buf_bo, - &psp->fence_buf_mc_addr, &psp->fence_buf); kfree(cmd); return 0; @@ -423,6 +421,10 @@ static int psp_hw_fini(void *handle) amdgpu_bo_free_kernel(&psp->fw_pri_bo, &psp->fw_pri_mc_addr, &psp->fw_pri_buf); + if (psp->fence_buf_bo) + amdgpu_bo_free_kernel(&psp->fence_buf_bo, + &psp->fence_buf_mc_addr, &psp->fence_buf); + return 0; } |