Skip to content

Commit bae2af0

Browse files
Xaver Huglgregkh
authored andcommitted
amdgpu/amdgpu_discovery: increase timeout limit for IFWI init
commit 9285873 upstream. 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 9ed3d7b) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 03875a4 commit bae2af0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,15 +276,15 @@ static int amdgpu_discovery_read_binary_from_mem(struct amdgpu_device *adev,
276276
u32 msg;
277277

278278
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,
280280
* but generally it should be in the 60-100ms range. Normally this starts
281281
* as soon as the device gets power so by the time the OS loads this has long
282282
* completed. However, when a card is hotplugged via e.g., USB4, we need to
283283
* wait for this to complete. Once the C2PMSG is updated, we can
284284
* continue.
285285
*/
286286

287-
for (i = 0; i < 1000; i++) {
287+
for (i = 0; i < 2000; i++) {
288288
msg = RREG32(mmMP0_SMN_C2PMSG_33);
289289
if (msg & 0x80000000)
290290
break;

0 commit comments

Comments
 (0)