drm/amdgpu: increase atombios cmd timeout
authorJohn Clements <john.clements@amd.com>
Thu, 5 Mar 2020 09:48:56 +0000 (17:48 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 6 Mar 2020 19:31:51 +0000 (14:31 -0500)
mitigates race condition on BACO reset between GPU bootcode and driver reload

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/atom.c

index dd30f4e61a8cd97c73c06dc756177dbc33a79d52..cae426c7c0863b06c7c50fcbefae95ce37262ba0 100644 (file)
@@ -744,8 +744,8 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg)
                        cjiffies = jiffies;
                        if (time_after(cjiffies, ctx->last_jump_jiffies)) {
                                cjiffies -= ctx->last_jump_jiffies;
-                               if ((jiffies_to_msecs(cjiffies) > 5000)) {
-                                       DRM_ERROR("atombios stuck in loop for more than 5secs aborting\n");
+                               if ((jiffies_to_msecs(cjiffies) > 10000)) {
+                                       DRM_ERROR("atombios stuck in loop for more than 10secs aborting\n");
                                        ctx->abort = true;
                                }
                        } else {