Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dac5936 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Call amdgpu_ucode_fini_bo in amd_powerplay.c 



make it symmetric with amdgpu_ucode_init_bo in amd_powerplay.c

refine the "commit b22558bb4ff8fc9fe925222f90297d7a03a5fb20"

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b905090d

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+0 −3
Original line number Diff line number Diff line
@@ -1489,9 +1489,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
	}



	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)

			continue;

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+7 −1
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ static int pp_sw_fini(void *handle) 
		if (hwmgr->smumgr_funcs->smu_fini != NULL)

			hwmgr->smumgr_funcs->smu_fini(hwmgr);

	}



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



	return 0;

}
@@ -201,7 +205,9 @@ static int pp_late_init(void *handle) 


static void pp_late_fini(void *handle)

{

	amd_powerplay_destroy(handle);

	struct amdgpu_device *adev = handle;



	amd_powerplay_destroy(adev);

}