From patchwork Thu Jul 7 22:33:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 954512 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 p67Ma5T6022967 for ; Thu, 7 Jul 2011 22:36:25 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C13079E849 for ; Thu, 7 Jul 2011 15:36:04 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from homiemail-a7.g.dreamhost.com (caiajhbdccac.dreamhost.com [208.97.132.202]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D2379E7B1 for ; Thu, 7 Jul 2011 15:35:45 -0700 (PDT) Received: from homiemail-a7.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a7.g.dreamhost.com (Postfix) with ESMTP id B9FFE25C063; Thu, 7 Jul 2011 15:35:44 -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=kYDJk6L4ZYNo xGAelsK57pw4+hSa7K3//owGNZcJ+vSTiSSRyhP9XbMq1d8d3ogwIRuvGfw9wBgg O1XugUcUEIAvZysbU+NaSM9vOlzV2sPz8Xn53dMWHUYQ/Qh91OhyzkTO4tBhYU2N SEz+vCOQpaLjgXEdeB4apLq4SOobkFs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id; s=whitecape.org; bh=mGxb0l8oYOQErxo cc5FhP4LFue4=; b=PMQ4YLcrYcni7rpCOpgNXssg5mIRQ42K+N1MYzBOkEyz3R6 a8BRnazmpQcDTBgC9PthuUjg15JvxcMVBZT4p5ZpSFHMAql2wZ4Un1Kr8Ocl3eBA h+O6cEnUGLWWsLW8BdbXeY08Sos7x05lLdbjTRoLQ7a8ESDKzN5V5D0PeJks= Received: from localhost (fruit.freedesktop.org [131.252.210.190]) (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 5297725C062; Thu, 7 Jul 2011 15:35:43 -0700 (PDT) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Thu, 7 Jul 2011 15:33:26 -0700 Message-Id: <1310078006-3632-1-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.7.4.4 Subject: [Intel-gfx] [PATCH resend] 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]); Thu, 07 Jul 2011 22:36:25 +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(-) (Somehow this got lost; resending. It still applies cleanly to -next.) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 649278f..ec4308d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -580,6 +580,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); /* If reset with a user forcewake, try to restore */