drm/amdgpu: Fix logic to determine TOS reload

Lijo Lazar · alexdeucher · commit f0b919960d6d · 2024-10-01T17:43:50.000-04:00
Avoid comparing TOS version on APUs. On APUs driver doesn't take care of TOS load. Fixes: 0ff3822 ("drm/amdgpu: Add interface for TOS reload cases") Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Acked-by: Rajneesh Bhardwaj <Rajneesh.bhardwaj@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2270,7 +2270,7 @@ bool amdgpu_psp_tos_reload_needed(struct amdgpu_device *adev)
 {
 	struct psp_context *psp = &adev->psp;
 
-	if (amdgpu_sriov_vf(adev))
+	if (amdgpu_sriov_vf(adev) || (adev->flags & AMD_IS_APU))
 		return false;
 
 	if (psp->funcs && psp->funcs->is_reload_needed)

Original file line number	Diff line number	Diff line change
`@@ -2270,7 +2270,7 @@ bool amdgpu_psp_tos_reload_needed(struct amdgpu_device *adev)`
`2270`	`2270`	`{`
`2271`	`2271`	`struct psp_context *psp = &adev->psp;`
`2272`	`2272`
`2273`		`- if (amdgpu_sriov_vf(adev))`
	`2273`	`+ if (amdgpu_sriov_vf(adev) \|\| (adev->flags & AMD_IS_APU))`
`2274`	`2274`	`return false;`
`2275`	`2275`
`2276`	`2276`	`if (psp->funcs && psp->funcs->is_reload_needed)`