浏览代码

drm/amd/pp: Use release_firmware directly in powerplay

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

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Rex Zhu 7 年之前
父节点
当前提交
64f6db77fc

+ 5 - 1
drivers/gpu/drm/amd/powerplay/amd_powerplay.c

@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/gfp.h>
 #include <linux/gfp.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
+#include <linux/firmware.h>
 #include "amd_shared.h"
 #include "amd_shared.h"
 #include "amd_powerplay.h"
 #include "amd_powerplay.h"
 #include "power_state.h"
 #include "power_state.h"
@@ -107,8 +108,11 @@ static int pp_sw_fini(void *handle)
 
 
 	hwmgr_sw_fini(hwmgr);
 	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);
 		amdgpu_ucode_fini_bo(adev);
+	}
 
 
 	return 0;
 	return 0;
 }
 }

+ 0 - 1
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c

@@ -2784,7 +2784,6 @@ static int ci_smu_fini(struct pp_hwmgr *hwmgr)
 {
 {
 	kfree(hwmgr->smu_backend);
 	kfree(hwmgr->smu_backend);
 	hwmgr->smu_backend = NULL;
 	hwmgr->smu_backend = NULL;
-	cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU);
 	return 0;
 	return 0;
 }
 }
 
 

+ 0 - 1
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c

@@ -650,6 +650,5 @@ int smu7_smu_fini(struct pp_hwmgr *hwmgr)
 
 
 	kfree(hwmgr->smu_backend);
 	kfree(hwmgr->smu_backend);
 	hwmgr->smu_backend = NULL;
 	hwmgr->smu_backend = NULL;
-	cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU);
 	return 0;
 	return 0;
 }
 }