leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: Call amdgpu_ucode_fini_bo in amd_powerplay.c

Browse Source 
make it symmetric with amdgpu_ucode_init_bo in amd_powerplay.c

refine the "commit b22558bb4ff8fc9fe925222f90297d7a03a5fb20"

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rex Zhu
2018-03-12 19:53:01 +08:00
committed by Alex Deucher
parent b905090d2b
commit 2dac5936e5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -1489,9 +1489,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
} }
for (i = adev->num_ip_blocks - 1; i >= 0; i--) { for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC &&
adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
amdgpu_ucode_fini_bo(adev);
if (!adev->ip_blocks[i].status.hw) if (!adev->ip_blocks[i].status.hw)
continue; continue;

8
drivers/gpu/drm/amd/powerplay/amd_powerplay.c
View File

@@ -134,6 +134,10 @@ static int pp_sw_fini(void *handle)
if (hwmgr->smumgr_funcs->smu_fini != NULL) if (hwmgr->smumgr_funcs->smu_fini != NULL)
hwmgr->smumgr_funcs->smu_fini(hwmgr); hwmgr->smumgr_funcs->smu_fini(hwmgr);
} }
if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
amdgpu_ucode_fini_bo(adev);
return 0; return 0;
} }
@@ -201,7 +205,9 @@ static int pp_late_init(void *handle)
static void pp_late_fini(void *handle) static void pp_late_fini(void *handle)
{ {
amd_powerplay_destroy(handle); struct amdgpu_device *adev = handle;
amd_powerplay_destroy(adev);
} }