Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp879180pxk; Thu, 17 Sep 2020 20:08:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+GzRE6rK4iX+FGBIFwLAp6amb79e9aGOzr77CQtiFSL655ADNAcnMaKBCcAs+dXjH/EZE X-Received: by 2002:a50:fb99:: with SMTP id e25mr36076543edq.281.1600398535987; Thu, 17 Sep 2020 20:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600398535; cv=none; d=google.com; s=arc-20160816; b=0LodjgHVAecvEnwGx0+ClXq5yfV2m4IkOyJkvxj+6TgW+zUD2u6mdnL9RtyQvK9r3i K4ASet1X2l0l/YD9iWbUhiXMwvw+jayisRc/5iBxHeBr8VKSpVEIC6hd/vn4gL31cZpb R9FlIhp8nYpG2EWKpsSaJ6AHLl8JB93RxO7A7ZzjZvkAB+cRlq4wobw83Kp080j49hKK tAs9tfnWm+vwWoYqNVel6F/M8QqDlrKwBYBNywswWbiG9BcXLS2hLGg4/1Dql25cBEzL BiRGUdrB0Iw+kzWKoZUoJC0vF5C1n7P7h1zmAdswKJ+vScNb34oU0TecMNv2cEuxIwM6 YxCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t/vO9Z113Bav1eDvEW3cjlxnZmIvbCQIKPVvdYGbTFs=; b=Fnany1xcJ5Zza/mvd5MxzX2y45pL2R891l6sqvT9q706aSRXLI2Muq0vf2RP7KRxkn TcPEC+5Nj1IpInk7hv+zdXha5fqkWWy057gDeT8k9BadzzaCA9aHT+HDGjgWE7+gp8kf pXx+SixWvbCQheIZxePS17PsAIp/P7593Xut8x9JVUrzk808iFPVu8rPY5Lbs8rVL7CI it9pgk3GsJL72+RoCym4dbDrTHZdKHG1DA1upzHo4pSY2Hvs9eUFRwtFnbFWJ5AdxnbY ZixGddMBfEPjmYq6P0B/NFjaf8BGdBtPDxEfwBqkWBKe5zCPQiCcRt5Bhvp69BHNz1xp FjcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GzuhfYwE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k6si1207327edr.111.2020.09.17.20.08.32; Thu, 17 Sep 2020 20:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GzuhfYwE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730540AbgIRDFV (ORCPT + 99 others); Thu, 17 Sep 2020 23:05:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:51722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727307AbgIRCEY (ORCPT ); Thu, 17 Sep 2020 22:04:24 -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 5ECA223119; Fri, 18 Sep 2020 02:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394664; bh=f8gRk8eAyptuVsstm1uPSzF0miGBAcPzNLfF8INKp44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GzuhfYwEojeUcWNHQwQwLq0XYRbt7pNkcRY7gvW4tP+4ImBMYBoJvRP4eJnszZ6u3 02MuZpCCHoFxS7TCJIe++5pUQspmqm01h0S9wA+jjxYtmKbeOduW8Gd4SK+PjQ+Egv pbDwDEBbFhPduHPVHKCIJXMUdtsEnWEzkclxnsVE= 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 5.4 158/330] drm/amdgpu: increase atombios cmd timeout Date: Thu, 17 Sep 2020 21:58:18 -0400 Message-Id: <20200918020110.2063155-158-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-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: linux-kernel@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 { -- 2.25.1