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: Pass IP suspend errors up to callers

If IP suspend fails the callers should be notified so that they can
potentially react.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Mario Limonciello and committed by
Alex Deucher 173360fe b7ff2e79

+8 -3
+8 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 3862 3862 adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP) 3863 3863 continue; 3864 3864 3865 - /* XXX handle errors */ 3866 3865 r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]); 3866 + if (r) 3867 + return r; 3867 3868 3868 3869 /* handle putting the SMC in the appropriate state */ 3869 3870 if (!amdgpu_sriov_vf(adev)) { ··· 5219 5218 5220 5219 amdgpu_ras_suspend(adev); 5221 5220 5222 - amdgpu_device_ip_suspend_phase1(adev); 5221 + r = amdgpu_device_ip_suspend_phase1(adev); 5222 + if (r) 5223 + return r; 5223 5224 5224 5225 amdgpu_amdkfd_suspend(adev, !amdgpu_sriov_vf(adev) && !adev->in_runpm); 5225 5226 amdgpu_userq_suspend(adev); ··· 5234 5231 5235 5232 amdgpu_fence_driver_hw_fini(adev); 5236 5233 5237 - amdgpu_device_ip_suspend_phase2(adev); 5234 + r = amdgpu_device_ip_suspend_phase2(adev); 5235 + if (r) 5236 + return r; 5238 5237 5239 5238 if (amdgpu_sriov_vf(adev)) 5240 5239 amdgpu_virt_release_full_gpu(adev, false);