drm/amdgpu: Fix APU handling in amdgpu_pm_load_smu_firmware()
Subsystems (3)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: Fix APU handling in amdgpu_pm_load_smu_firmware()
We only need to skip this on modern APUs. It's required on older APUs as it's where start_smu gets called from.
Fixes 064d92436b69 ("drm/amd/pm: avoid to load smu firmware for APUs")
Signed-off-by Alex Deucher <[email protected]>
Cc Tim Huang <[email protected]>
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2 -1
@@ -631,7 +631,8 @@ int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t *smu_versioconst struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;int r =0 ; -if (!pp_funcs || !pp_funcs->load_firmware || adev->flags &AMD_IS_APU ) +if (!pp_funcs || !pp_funcs->load_firmware || + (is_support_sw_smu (adev) && (adev->flags &AMD_IS_APU )))return 0 ;mutex_lock (&adev->pm.mutex);
Signature · 1 line
2.45.2
[Public]
This patch is,
Reviewed-by Tim Huang <[email protected]>
Quoted 38 lines
-----Original Message-----
From: Deucher, Alexander <[email protected]>
Sent: Friday, July 26, 2024 5:36 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH] drm/amdgpu: Fix APU handling inamdgpu_pm_load_smu_firmware()We only need to skip this on modern APUs. It's required on older APUs as it's where
start_smugets called from.Fixes 064d92436b69 ("drm/amd/pm: avoid to load smu firmware for APUs")Signed-off-by Alex Deucher <[email protected]>Cc Tim Huang <[email protected]>--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -631,7 +631,8 @@ int amdgpu_pm_load_smu_firmware(struct
amdgpu_device*adev,uint32_t*smu_versioconst struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; int r = 0;drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2-if (!pp_funcs || !pp_funcs->load_firmware || adev->flags &AMD_IS_APU ) +if (!pp_funcs || !pp_funcs->load_firmware || + (is_support_sw_smu (adev) && (adev->flags &AMD_IS_APU )))return 0 ;mutex_lock (&adev->pm.mutex); --2.45.2