korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-10 07:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: remove superfluous check

Browse Source 
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Huang Rui 2017-06-02 10:42:28 +08:00 committed by Alex Deucher
parent 57ea8c7b4d
commit edc4d3db06
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
View File

@ -435,16 +435,11 @@ static int psp_hw_fini(void *handle)
psp_ring_destroy(psp, PSP_RING_TYPE__KM); psp_ring_destroy(psp, PSP_RING_TYPE__KM);
if (psp->tmr_buf) amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf); amdgpu_bo_free_kernel(&psp->fw_pri_bo,
&psp->fw_pri_mc_addr, &psp->fw_pri_buf);
if (psp->fw_pri_buf) amdgpu_bo_free_kernel(&psp->fence_buf_bo,
amdgpu_bo_free_kernel(&psp->fw_pri_bo, &psp->fence_buf_mc_addr, &psp->fence_buf);
&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);
kfree(psp->cmd); kfree(psp->cmd);
psp->cmd = NULL; psp->cmd = NULL;

8
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
View File

@ -341,10 +341,10 @@ int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64), ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64),
0x80000000, 0x80000000, false); 0x80000000, 0x80000000, false);
if (ring->ring_mem) amdgpu_bo_free_kernel(&adev->firmware.rbuf,
amdgpu_bo_free_kernel(&adev->firmware.rbuf, &ring->ring_mem_mc_addr,
&ring->ring_mem_mc_addr, (void **)&ring->ring_mem);
(void **)&ring->ring_mem);
return ret; return ret;
} }