Commit 64f6db77 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Use release_firmware directly in powerplay 



Use kernel api directly so we can deprecate the cgs interface.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8bb575a2

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

+5 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/kernel.h>

#include <linux/gfp.h>

#include <linux/slab.h>

#include <linux/firmware.h>

#include "amd_shared.h"

#include "amd_powerplay.h"

#include "power_state.h"
@@ -107,8 +108,11 @@ static int pp_sw_fini(void *handle) 


	hwmgr_sw_fini(hwmgr);



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

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

		release_firmware(adev->pm.fw);

		adev->pm.fw = NULL;

		amdgpu_ucode_fini_bo(adev);

	}



	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c

+0 −1
Original line number Diff line number Diff line
@@ -2784,7 +2784,6 @@ static int ci_smu_fini(struct pp_hwmgr *hwmgr) 
{

	kfree(hwmgr->smu_backend);

	hwmgr->smu_backend = NULL;

	cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU);

	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c

+0 −1
Original line number Diff line number Diff line
@@ -650,6 +650,5 @@ int smu7_smu_fini(struct pp_hwmgr *hwmgr) 


	kfree(hwmgr->smu_backend);

	hwmgr->smu_backend = NULL;

	cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU);

	return 0;

}