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.

amdgpu/amdgpu_discovery: increase timeout limit for IFWI init

With a timeout of only 1 second, my rx 5700XT fails to initialize,
so this increases the timeout to 2s.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3697
Signed-off-by: Xaver Hugl <xaver.hugl@kde.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 9ed3d7bdf2dcdf1a1196630fab89a124526e9cc2)
Cc: stable@vger.kernel.org

authored by

Xaver Hugl and committed by
Alex Deucher 92858738 124ffa29

+2 -2
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
··· 276 276 u32 msg; 277 277 278 278 if (!amdgpu_sriov_vf(adev)) { 279 - /* It can take up to a second for IFWI init to complete on some dGPUs, 279 + /* It can take up to two second for IFWI init to complete on some dGPUs, 280 280 * but generally it should be in the 60-100ms range. Normally this starts 281 281 * as soon as the device gets power so by the time the OS loads this has long 282 282 * completed. However, when a card is hotplugged via e.g., USB4, we need to ··· 284 284 * continue. 285 285 */ 286 286 287 - for (i = 0; i < 1000; i++) { 287 + for (i = 0; i < 2000; i++) { 288 288 msg = RREG32(mmMP0_SMN_C2PMSG_33); 289 289 if (msg & 0x80000000) 290 290 break;