From patchwork Tue Jun 7 22:54:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 860062 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p57Mv6Su026709 for ; Tue, 7 Jun 2011 22:57:27 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 796FB9F593 for ; Tue, 7 Jun 2011 15:57:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from homiemail-a62.g.dreamhost.com (caiajhbdccah.dreamhost.com [208.97.132.207]) by gabe.freedesktop.org (Postfix) with ESMTP id 978079F0FD for ; Tue, 7 Jun 2011 15:55:56 -0700 (PDT) Received: from homiemail-a62.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a62.g.dreamhost.com (Postfix) with ESMTP id 6860C63406F; Tue, 7 Jun 2011 15:55:56 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=whitecape.org; h=from:to:cc :subject:date:message-id:in-reply-to:references; q=dns; s= whitecape.org; b=wn0nvDHcJ3JeFmJic01SeMihIn8w3ch05q3W/5FSRimr9jp ZRTemRL4pUQ5+Os4ZBLmHQNDXSBOil1/2bMrFpV4conkxxGsNcPLpbG8wWiisz4t KOcE4lZnngr/6x7lTKaatjMhBhJfUAqyVUxThczPp+vsk0ypbh795O5/IZms= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id:in-reply-to:references; s= whitecape.org; bh=qZIPbOet/xyLvzv8WEh/ZWz86Ic=; b=gxuVv7H0ucJC4B PpNtlgg/iO6tO4p4Pr4sxyr0ed7Wbu51T5PCNU4kDuuhTe9n36RCzMlJ3eRpp4cK X3pJB6J61Yb80E3BUoZQRZcNtmKaWsn14valeHl7QxoY6y/a+Z59Im7P+f61uErb wfTtXAY9mUraHzHIT/wEleNFPzvBE= Received: from localhost (c-24-21-202-86.hsd1.or.comcast.net [24.21.202.86]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: kenneth@whitecape.org) by homiemail-a62.g.dreamhost.com (Postfix) with ESMTPSA id 2F15463406C; Tue, 7 Jun 2011 15:55:56 -0700 (PDT) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Tue, 7 Jun 2011 15:54:41 -0700 Message-Id: <1307487281-3015-3-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307487281-3015-1-git-send-email-kenneth@whitecape.org> References: <1307487281-3015-1-git-send-email-kenneth@whitecape.org> Subject: [Intel-gfx] [PATCH 3/3] drm/i915: Enable GPU reset on Ivybridge. 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 22:57:52 +0000 (UTC) According to the hardware documentation, GDRST is exactly the same as on Sandybridge. So simply enable the existing code. Signed-off-by: Kenneth Graunke Reviewed-by: Keith Packard --- drivers/gpu/drm/i915/i915_drv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0defd42..b641a64 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -577,6 +577,7 @@ int i915_reset(struct drm_device *dev, u8 flags) if (get_seconds() - dev_priv->last_gpu_reset < 5) { DRM_ERROR("GPU hanging too fast, declaring wedged!\n"); } else switch (INTEL_INFO(dev)->gen) { + case 7: case 6: ret = gen6_do_reset(dev, flags); break;