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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 92C20C433E8 for ; Tue, 14 Jul 2020 19:02:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66C3D22B4E for ; Tue, 14 Jul 2020 19:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753371; bh=gDKXQ/PAHVKYxnxL2ZYanWXTvcB6U0Hatju/fOfkOns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eoRyu6+V1OXPRB5e/FAmVJkrcR3rwwLtNPVr7twmj3LgJHcIqyid86v5vrBKhJ3QM LVn+wlktjs5HnMPiD5oiD2C02PQmUNKzliTGkP81JwPYXtGWigcw9X46NmeZazmKLs FJp7GxpyqtO/pBoi9hCCDV3Xk3CH/eEL82HvnBCc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729613AbgGNS7P (ORCPT ); Tue, 14 Jul 2020 14:59:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:57854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730001AbgGNS7P (ORCPT ); Tue, 14 Jul 2020 14:59:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 9473922B2E; Tue, 14 Jul 2020 18:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753155; bh=gDKXQ/PAHVKYxnxL2ZYanWXTvcB6U0Hatju/fOfkOns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lHZnBB9A00LYKtueXbQ56nStqFBLkH+qNv4PzAF00+/T+co1BiHk9CkoDk5S+rSSM UkmUBcBgAvlwxEa+vKjvqGaEY2gJEobz51zdHVzbSUdpeqOUmcFTclqhVzgDmF/OqI xfhfUJ6Emx2dLWizzorZ3lrqU990q8+u36sd421Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5.7 141/166] drm/amdgpu: dont do soft recovery if gpu_recovery=0 Date: Tue, 14 Jul 2020 20:45:06 +0200 Message-Id: <20200714184122.576405550@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Olšák commit f4892c327a8e5df7ce16cab40897daf90baf6bec upstream. It's impossible to debug shader hangs with soft recovery. Signed-off-by: Marek Olšák Reviewed-by: Alex Deucher Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -36,7 +36,8 @@ static void amdgpu_job_timedout(struct d memset(&ti, 0, sizeof(struct amdgpu_task_info)); - if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { + if (amdgpu_gpu_recovery && + amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { DRM_ERROR("ring %s timeout, but soft recovered\n", s_job->sched->name); return;