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 CFDACC433E7 for ; Tue, 14 Jul 2020 19:07:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3B7421D79 for ; Tue, 14 Jul 2020 19:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753626; bh=gDKXQ/PAHVKYxnxL2ZYanWXTvcB6U0Hatju/fOfkOns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qQ7sieI6I2Tsw5cHzvb1bD4tWUOzKYvODnC0ImGzieubbwteYe9IT5eWZpuvwSqaH 7eLfM+h72uvedimfXmF5AdPT1AfsyBdDwhXUnvUH8jROV74xvy2O7+yY6E6UL9T3eD oDegc8lSkppQXd5wJbMGafQnobebZy19v3t7UYjU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729326AbgGNSwc (ORCPT ); Tue, 14 Jul 2020 14:52:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:49258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730519AbgGNSwc (ORCPT ); Tue, 14 Jul 2020 14:52:32 -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 25A1E22AB0; Tue, 14 Jul 2020 18:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752751; bh=gDKXQ/PAHVKYxnxL2ZYanWXTvcB6U0Hatju/fOfkOns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hRXFMOsQFkRAb7ACmoGjpsk0CPZmIuINkY9NkKHxPRxezD2qHNOImDgZIA7BjLYt+ ir8MG9ABOdvZ301fWMiW5OO8jnyuwwdwA1ilFmEpX8h1WD0CjEjo4nK059enbRnZ6E y1jxvS8JK86WQNlZWoGgnyZy3VL+BtM02yGBI3ds= 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.4 096/109] drm/amdgpu: dont do soft recovery if gpu_recovery=0 Date: Tue, 14 Jul 2020 20:44:39 +0200 Message-Id: <20200714184110.163371173@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@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;