From patchwork Thu May 12 11:25:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 778882 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4C3TTE1018643 for ; Thu, 12 May 2011 03:29:51 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A3749E7CE for ; Wed, 11 May 2011 20:29:28 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from homiemail-a7.g.dreamhost.com (caiajhbdcahe.dreamhost.com [208.97.132.74]) by gabe.freedesktop.org (Postfix) with ESMTP id 6608E9E745 for ; Wed, 11 May 2011 20:29:10 -0700 (PDT) Received: from homiemail-a7.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a7.g.dreamhost.com (Postfix) with ESMTP id 5BBD925C063; Wed, 11 May 2011 20:29:08 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=whitecape.org; h=from:to:cc :subject:date:message-id; q=dns; s=whitecape.org; b=BU9U8JZ29Ael tOuQJHB58YSutRmkE+sRo0dew+0jhGOWDgUfq1WrxceWmxNajVays/oeS1ykarc4 wPsYVJEoEpSOYFJOE60oGLvn0J8yV5VlhEX2Xe29XHKngukkjOk3iIX53Cy6xyfs 9KtJzoyIug4mHLAOfJerN6FYvlzbB6k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id; s=whitecape.org; bh=90nDeY6sH6jkhPM s1tra4yjbkqw=; b=K6uyYgPKn2ukNCkYFaNDx3BcMfVuNhKV8y6PdxqN67f6SWY kK58ToEwo3GFGHSNt5E37S/582B8P/GI4f5FOChmFpIkZFb33GsCpIEx5V+pzIsA iWWIeQxTBGK+sDHdgcd61TOqJX6e2JvDpmeengxhhue8f26qS7tHheGK5ftg= Received: from localhost (static-50-43-46-73.bvtn.or.frontiernet.net [50.43.46.73]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: kenneth@whitecape.org) by homiemail-a7.g.dreamhost.com (Postfix) with ESMTPSA id 2224F25C062; Wed, 11 May 2011 20:29:08 -0700 (PDT) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Thu, 12 May 2011 04:25:13 -0700 Message-Id: <1305199513-4402-1-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.7.4.4 Subject: [Intel-gfx] [PATCH] 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 (demeter2.kernel.org [140.211.167.43]); Thu, 12 May 2011 03:29:51 +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 --- drivers/gpu/drm/i915/i915_drv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) GPU reset does not seem terribly reliable, but did work at least once: My GPU hung halfway through an OpenArena run, successfully reset (the screen went blank for a moment), and continued rendering, finishing the time demo. I was also able to run glxgears after the reset. diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f72f9ff..71a06d0 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -547,6 +547,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;