From patchwork Tue Sep 29 10:58:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 263285 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 1108AC47423 for ; Tue, 29 Sep 2020 11:38:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C614F208FE for ; Tue, 29 Sep 2020 11:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379515; bh=f8gRk8eAyptuVsstm1uPSzF0miGBAcPzNLfF8INKp44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=w/uxYEfBfP/7C3y/ElUbORbeZv1JYhKftskluL4vAhVAVdGtqZfnrZORPfjDc1TKC ewLsNAGzg2gcxdwcNKC3fxwP/iUFGEYaWxcKsQTTD5l81JPdGUOY/swyOyKh+Jaotp LjhIOOXycpWvgBJAg/22IpESaGp1F2WDnpR7AVIE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730327AbgI2Lif (ORCPT ); Tue, 29 Sep 2020 07:38:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:60302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729812AbgI2Lie (ORCPT ); Tue, 29 Sep 2020 07:38:34 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A8A5E221EF; Tue, 29 Sep 2020 11:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379501; bh=f8gRk8eAyptuVsstm1uPSzF0miGBAcPzNLfF8INKp44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CQnCf0ylnvJVtNetMbSHsagO6gL5W2l2upzOqrPCojRfIw/G3lL+M2TVixIISG+om TwKP2GNGgO/bMfWVPRW4heEnJyvc/NC12zpuOxz6Aos7v43Gi+0deDiDGrt9A1wDDl K5QQRqq1qBhD+tziC4tJcYM9EOMXWqEbd6ii60VI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hawking Zhang , John Clements , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 152/388] drm/amdgpu: increase atombios cmd timeout Date: Tue, 29 Sep 2020 12:58:03 +0200 Message-Id: <20200929110017.828464979@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 dd30f4e61a8cd..cae426c7c0863 100644 --- a/drivers/gpu/drm/amd/amdgpu/atom.c +++ b/drivers/gpu/drm/amd/amdgpu/atom.c @@ -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 {