From patchwork Thu Feb 25 19:09:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 82098 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1PJAf3M032572 for ; Thu, 25 Feb 2010 19:11:21 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E3C8DA01FA; Thu, 25 Feb 2010 11:10:17 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 906769EB5B; Thu, 25 Feb 2010 11:10:07 -0800 (PST) Received: from pollan.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id 48A3D130131; Thu, 25 Feb 2010 11:10:07 -0800 (PST) Received: by pollan.anholt.net (Postfix, from userid 1000) id 0A0E664045; Thu, 25 Feb 2010 11:10:03 -0800 (PST) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Thu, 25 Feb 2010 11:09:54 -0800 Message-Id: <1267124996-17821-12-git-send-email-eric@anholt.net> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1267124996-17821-1-git-send-email-eric@anholt.net> References: <1267124996-17821-1-git-send-email-eric@anholt.net> Subject: [Intel-gfx] [PATCH 11/13] drm/i915: Disable the hangcheck reset on Sandybridge until we add support. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Feb 2010 19:11:21 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ef79d94..f93f822 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1239,7 +1239,11 @@ void i915_hangcheck_elapsed(unsigned long data) struct drm_device *dev = (struct drm_device *)data; drm_i915_private_t *dev_priv = dev->dev_private; uint32_t acthd; - + + /* No reset support on this chip yet. */ + if (IS_GEN6(dev)) + return; + if (!IS_I965G(dev)) acthd = I915_READ(ACTHD); else