Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755925Ab0LMAXm (ORCPT ); Sun, 12 Dec 2010 19:23:42 -0500 Received: from one.firstfloor.org ([213.235.205.2]:44839 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754358Ab0LLXpq (ORCPT ); Sun, 12 Dec 2010 18:45:46 -0500 From: Andi Kleen References: <201012131244.547034648@firstfloor.org> In-Reply-To: <201012131244.547034648@firstfloor.org> To: keithp@keithp.com, ak@linux.intel.com, chris@chris-wilson.co.uk, gregkh@suse.de, linux-kernel@vger.kernel.org, stable@kernel.org Subject: [PATCH] [48/223] drm/i915: Free hardware status page on unload when physically mapped Message-Id: <20101212234545.744BDB27BF@basil.firstfloor.org> Date: Mon, 13 Dec 2010 00:45:45 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1436 Lines: 41 2.6.35-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Keith Packard commit c2873e9633fe908dccd36dbb1d370e9c59a1ca62 upstream. A physically mapped hardware status page is allocated at driver load time but was never freed. Call the existing code to free this page at driver unload time on hardware which uses this kind. Signed-off-by: Keith Packard Signed-off-by: Andi Kleen [ickle: call before tearing down registers on KMS-only path, as pointed out by Dave Airlie] Signed-off-by: Chris Wilson Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_dma.c | 3 +++ 1 file changed, 3 insertions(+) Index: linux/drivers/gpu/drm/i915/i915_dma.c =================================================================== --- linux.orig/drivers/gpu/drm/i915/i915_dma.c +++ linux/drivers/gpu/drm/i915/i915_dma.c @@ -2297,6 +2297,9 @@ int i915_driver_unload(struct drm_device i915_gem_lastclose(dev); intel_cleanup_overlay(dev); + + if (!I915_NEED_GFX_HWS(dev)) + i915_free_hws(dev); } intel_teardown_mchbar(dev); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/