From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 811B4C43465 for ; Fri, 18 Sep 2020 02:34:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AC1123770 for ; Fri, 18 Sep 2020 02:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600396467; bh=t330OXA9dxggzEfcHbh5rTp6xcbmDBUHLw4W8YKKisE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QotpPwA0pXoyTaQ3eFNAYLYT7riyo/fmirH0ceEOd/ssyu5S/6dUXRRTZiizi7MmU r4RkMXOZlU4aQZ23nIFdxpjKrWcpmWOiujRuafsaImci/fg+5yGLdqqg5PCfKbFs31 lpnIQJb1uzE0lPMri8BKlc1GGAdVn26kYGcH0HR4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729899AbgIRCeZ (ORCPT ); Thu, 17 Sep 2020 22:34:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:40870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728948AbgIRCNc (ORCPT ); Thu, 17 Sep 2020 22:13:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A0B942388D; Fri, 18 Sep 2020 02:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395212; bh=t330OXA9dxggzEfcHbh5rTp6xcbmDBUHLw4W8YKKisE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xnbgnt+k6dbiNKEATVGQ428kchn+m6Y7VuCGtJLu/FJauCd3fIsViaG4dcgVAc9cg lHwy1IfP5pPHo/zk84oCw3b2Zhh34da4v859snK4E5yC2r/Hj8ZHT8RSB3vQ70zrxd Fq64r74WBwM8eRZlpEgrmcIvUAq0Ysqln4iQvULY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Clements , Hawking Zhang , Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 060/127] drm/amdgpu: increase atombios cmd timeout Date: Thu, 17 Sep 2020 22:11:13 -0400 Message-Id: <20200918021220.2066485-60-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918021220.2066485-1-sashal@kernel.org> References: <20200918021220.2066485-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Clements [ Upstream commit 1b3460a8b19688ad3033b75237d40fa580a5a953 ] mitigates race condition on BACO reset between GPU bootcode and driver reload Reviewed-by: Hawking Zhang Signed-off-by: John Clements Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c index d69aa2e179bbe..e4874cc209ef4 100644 --- a/drivers/gpu/drm/amd/amdgpu/atom.c +++ b/drivers/gpu/drm/amd/amdgpu/atom.c @@ -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 { -- 2.25.1