Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5bc081a authored by John Clements's avatar John Clements Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: increase atombios cmd timeout 



[ Upstream commit 1b3460a8b19688ad3033b75237d40fa580a5a953 ]

mitigates race condition on BACO reset between GPU bootcode and driver reload

Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2b294ac3

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

+2 −2
Original line number Diff line number Diff line
@@ -742,8 +742,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 {