From patchwork Thu Oct 7 04:24:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 237651 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o974PSwd006306 for ; Thu, 7 Oct 2010 04:25:49 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E22099EC9B for ; Wed, 6 Oct 2010 21:25:28 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 29FA39E7E9; Wed, 6 Oct 2010 21:24:52 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id DE19C760133; Wed, 6 Oct 2010 21:24:51 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id asF5n+vvZDT2; Wed, 6 Oct 2010 21:24:49 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1033) id 876A976012D; Wed, 6 Oct 2010 21:24:49 -0700 (PDT) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 854837600FF; Wed, 6 Oct 2010 21:24:49 -0700 (PDT) Received: by koto.keithp.com (Postfix, from userid 1488) id 2FA0511C18D; Wed, 6 Oct 2010 21:24:49 -0700 (PDT) From: Keith Packard To: intel-gfx@lists.freedesktop.org Subject: [PATCH] drm/i915: Free hardware status page on unload when physically mapped Date: Wed, 6 Oct 2010 21:24:47 -0700 Message-Id: <1286425487-22515-1-git-send-email-keithp@keithp.com> X-Mailer: git-send-email 1.7.1 Cc: dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 07 Oct 2010 04:25:49 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 9d67b48..98bf1f0 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -2305,6 +2305,9 @@ int i915_driver_unload(struct drm_device *dev) intel_cleanup_overlay(dev); } + if (!I915_NEED_GFX_HWS(dev)) + i915_free_hws(dev); + intel_teardown_mchbar(dev); pci_dev_put(dev_priv->bridge_dev);