From patchwork Thu Jun 2 14:29:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9150179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8630C60221 for ; Thu, 2 Jun 2016 14:29:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7757828047 for ; Thu, 2 Jun 2016 14:29:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6BC8C282E8; Thu, 2 Jun 2016 14:29:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05D5028047 for ; Thu, 2 Jun 2016 14:29:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CA1C6E026; Thu, 2 Jun 2016 14:29:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x244.google.com (mail-qt0-x244.google.com [IPv6:2607:f8b0:400d:c0d::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 495456EBB4 for ; Thu, 2 Jun 2016 14:29:37 +0000 (UTC) Received: by mail-qt0-x244.google.com with SMTP id i58so1215794qta.3 for ; Thu, 02 Jun 2016 07:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Jk7IlU4JHs3BKao51iuRhlU0UvnRRjzUZFtTu4O1tUg=; b=q36gwlH6U8ZAFXjTjrJ1GlTWTj9bjA5r1j5vf7F8Pzs44DmUzLMOXOfKozkYL1NnlB pPgzwe6BUFPYjxAIlqAkFggFOy+jf++ad+0vgDLHF18hfrUEBTyTyc1XAZW+EfE9C83Z Fr36VENjed04G8CS+7nGnvivnZs4hG6kSc+toDECUsJX+WHGol8gmorLXIsagxzGKzEz nuMcTVRuKsBNbUS5O5PcrXcZjgQumlPIKwWVsWeNpp7jIBCYgJbWhC7YHqlKs1I8uqOu 6icOHjp8h/1XzDW9hsTvN6kUhh4A4ti8vFEw8sUrUd/7FWBSPBZl1j0EWCL+tVEymkt0 YgxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Jk7IlU4JHs3BKao51iuRhlU0UvnRRjzUZFtTu4O1tUg=; b=TCcTQJIHuTc33GuJuqsZfbX6rAYICAyxixXwViT8/bwBEF4u8p4Km9J6qU2hvrOqC/ zCUI9Nabbf0pv6B/zOQm7ffbSZTElAOicri9QtmXJM41aMFPve5Tz+rjV8PUH3Htt0Kd ZxP+0g0g2zgP3kJTfiR25jm0OQ+b5EHqpTz7E9R6+Nt4BgDALSIJn1PFQKgnsGreeyaS Kv2j8hc+6Bq6+hWy3xtTbNLB0hQHBkaJwl8xdwpgBEldiRh89htbafKNQzc8qdgSBpof HdTK2aNSQDYoxBb9BVwBHo61kyl/nCG5W18TtJcxhNO5mVAJLKZaDUkQqGD1KGoQaJzm gFrA== X-Gm-Message-State: ALyK8tIOaf+nnOVFY1SZ+IFWAxV+59CowwfeWdOvm9b7kbjOaF3CoR6OKqMzG+auGGVPng== X-Received: by 10.200.54.227 with SMTP id b32mr9334635qtc.15.1464877776130; Thu, 02 Jun 2016 07:29:36 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id r10sm214036qha.33.2016.06.02.07.29.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Jun 2016 07:29:35 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu: add gpu reset to timeout handler Date: Thu, 2 Jun 2016 10:29:29 -0400 Message-Id: <1464877769-28765-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Chunming Zhou so that we could actually reset the GPU when it hangs. Signed-off-by: Chunming Zhou Reviewed-by: Junwei Zhang Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 34cd971..d4791a7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -36,6 +36,7 @@ static void amdgpu_job_timedout(struct amd_sched_job *s_job) job->base.sched->name, atomic_read(&job->ring->fence_drv.last_seq), job->ring->fence_drv.sync_seq); + amdgpu_gpu_reset(job->adev); } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,