From patchwork Sat Aug 8 20:34:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gamari X-Patchwork-Id: 40193 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n78KZ8AO030407 for ; Sat, 8 Aug 2009 20:35:08 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 054109E798; Sat, 8 Aug 2009 13:35:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from qw-out-1920.google.com (qw-out-1920.google.com [74.125.92.150]) by gabe.freedesktop.org (Postfix) with ESMTP id 485E09E745 for ; Sat, 8 Aug 2009 13:35:01 -0700 (PDT) Received: by qw-out-1920.google.com with SMTP id 4so850209qwk.12 for ; Sat, 08 Aug 2009 13:35:01 -0700 (PDT) Received: by 10.224.45.196 with SMTP id g4mr2133982qaf.16.1249763701354; Sat, 08 Aug 2009 13:35:01 -0700 (PDT) Received: from localhost.localdomain ([128.164.237.143]) by mx.google.com with ESMTPS id 6sm7346363qwk.34.2009.08.08.13.35.00 (version=SSLv3 cipher=RC4-MD5); Sat, 08 Aug 2009 13:35:00 -0700 (PDT) From: Ben Gamari To: Owain Ainsworth , Jesse Barnes , Chris Wilson , intel-gfx@lists.freedesktop.org Date: Sat, 8 Aug 2009 16:34:40 -0400 Message-Id: <1249763687-5252-2-git-send-email-bgamari.foss@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249763687-5252-1-git-send-email-bgamari.foss@gmail.com> References: <1249763687-5252-1-git-send-email-bgamari.foss@gmail.com> Subject: [Intel-gfx] [PATCH 1/8] drm/i915: Check whether chip is wedged in i915_wait_request() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org i915_wait_request() only checks mm.wedged after it interacts with the hardware, generally causing the driver to lock up waiting for a wedged chip. Make sure we check mm.wedged as the first thing we do. --- drivers/gpu/drm/i915/i915_gem.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 140bee1..04cc326 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1736,6 +1736,9 @@ i915_wait_request(struct drm_device *dev, uint32_t seqno) BUG_ON(seqno == 0); + if (dev_priv->mm.wedged) + return -EIO; + if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) { if (IS_IGDNG(dev)) ier = I915_READ(DEIER) | I915_READ(GTIER);