From patchwork Tue Oct 8 10:25:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3002441 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E4E719F1E1 for ; Tue, 8 Oct 2013 10:26:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3C352014A for ; Tue, 8 Oct 2013 10:26:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3F9A22012B for ; Tue, 8 Oct 2013 10:26:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DB81E6689 for ; Tue, 8 Oct 2013 03:26:23 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F146E69C8 for ; Tue, 8 Oct 2013 03:25:59 -0700 (PDT) Received: by mail-ea0-f172.google.com with SMTP id r16so3894032ead.17 for ; Tue, 08 Oct 2013 03:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=2RUQ9mJo+Qfp9O6ukq48bjT+pvpd5GmE1xBAsdRlaNM=; b=UgJ/xNLRYsjLhmHkaz9RQ2SVrQg1ZNLKnJhllNsnpy9SuHdpf7/NlOnmHQw+uXWuQb YtQFj4hek+cryBnyhUZZhg3eRQltSM3VKxAwPk2NEhXi+svZQoaj0nl5wkZSqhzFD5oV +nAFV6r/G4fvskiiBAkdnocBmOl5OcYiaf7/M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2RUQ9mJo+Qfp9O6ukq48bjT+pvpd5GmE1xBAsdRlaNM=; b=axjkiFRAvtXYGSpbvTDwRLiJxFIYOIxHT2oJkiN8P4gKfruKkzplDyEot6Lh8aHumM ZzyFP7zv+gZUnuY8bioYLowuJLOkA8/bnZmVCaU4a4VeI0FEhi3J9CmORiiOaFJRq+30 aIvF9nkqXySFU38Rm+NvRR//4ro8JlZ2HdK57ZSvi9UvyB14baV6XuVMD1snMB4wg/Sl cYJZ+7/jw+zKDu5Q/q9c7Egzxy2BwGm0btHrR9nZodCb977POwGFPxaRdYS3LrdAEZc5 wrVs3sWwmY/gx5+03B7kVNNrPAMoVItkxQc4xtovruelodnaR0SgozzcISvjWar/JR8H yM1A== X-Gm-Message-State: ALoCoQlUAB5GxUBrZhCqjG3PqXK9+Y1c+wk1EK6nVW7Vs5JGbjCrb8T2+RrExjEGGMl16aRl7SHt X-Received: by 10.14.98.4 with SMTP id u4mr131050eef.96.1381227958172; Tue, 08 Oct 2013 03:25:58 -0700 (PDT) Received: from muecke.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id b45sm74153909eef.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 08 Oct 2013 03:25:57 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 8 Oct 2013 12:25:41 +0200 Message-Id: <1381227943-4409-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.1.4 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/3] drm/i915: rip out gen2 reset code X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP At least on my i830M here it reliably results in hard system hangs nowadays. This is much worse than falling back to software rendering, so I think we should simply rip this out. After all we don't have any gpu reset for gen3 either, and there are a lot more of those still around. Cc: Chris Wilson Signed-off-by: Daniel Vetter Acked-by: Chris Wilson --- drivers/gpu/drm/i915/intel_uncore.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 288a3a6..bfc1a65 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -490,36 +490,6 @@ int i915_reg_read_ioctl(struct drm_device *dev, return 0; } -static int i8xx_do_reset(struct drm_device *dev) -{ - struct drm_i915_private *dev_priv = dev->dev_private; - - if (IS_I85X(dev)) - return -ENODEV; - - I915_WRITE(D_STATE, I915_READ(D_STATE) | DSTATE_GFX_RESET_I830); - POSTING_READ(D_STATE); - - if (IS_I830(dev) || IS_845G(dev)) { - I915_WRITE(DEBUG_RESET_I830, - DEBUG_RESET_DISPLAY | - DEBUG_RESET_RENDER | - DEBUG_RESET_FULL); - POSTING_READ(DEBUG_RESET_I830); - msleep(1); - - I915_WRITE(DEBUG_RESET_I830, 0); - POSTING_READ(DEBUG_RESET_I830); - } - - msleep(1); - - I915_WRITE(D_STATE, I915_READ(D_STATE) & ~DSTATE_GFX_RESET_I830); - POSTING_READ(D_STATE); - - return 0; -} - static int i965_reset_complete(struct drm_device *dev) { u8 gdrst; @@ -621,7 +591,6 @@ int intel_gpu_reset(struct drm_device *dev) case 6: return gen6_do_reset(dev); case 5: return ironlake_do_reset(dev); case 4: return i965_do_reset(dev); - case 2: return i8xx_do_reset(dev); default: return -ENODEV; } }