tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Rex Zhu and committed by
Alex Deucher 64f6db77 8bb575a2

+5 -3
+5 -1
drivers/gpu/drm/amd/powerplay/amd_powerplay.c
··· 25 25 #include <linux/kernel.h> 26 26 #include <linux/gfp.h> 27 27 #include <linux/slab.h> 28 + #include <linux/firmware.h> 28 29 #include "amd_shared.h" 29 30 #include "amd_powerplay.h" 30 31 #include "power_state.h" ··· 108 107 109 108 hwmgr_sw_fini(hwmgr); 110 109 111 - if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) 110 + if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) { 111 + release_firmware(adev->pm.fw); 112 + adev->pm.fw = NULL; 112 113 amdgpu_ucode_fini_bo(adev); 114 + } 113 115 114 116 return 0; 115 117 }
-1
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
··· 2784 2784 { 2785 2785 kfree(hwmgr->smu_backend); 2786 2786 hwmgr->smu_backend = NULL; 2787 - cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU); 2788 2787 return 0; 2789 2788 } 2790 2789
-1
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
··· 650 650 651 651 kfree(hwmgr->smu_backend); 652 652 hwmgr->smu_backend = NULL; 653 - cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU); 654 653 return 0; 655 654 }