This is a note to let you know that I have just added a patch titled
Subject: [PATCH 05/21] drm/i915: Free hardware status page on unload when physically mapped
to the drm-next branch of the 2.6.32+drm33-longterm tree which can be found at
http://git.kernel.org/?p=linux/kernel/git/smb/linux-2.6.32.y-drm33.z.git;a=shortlog;h=refs/heads/drm-next
If you, or anyone else, feels it should not be added to the drm33-longterm tree,
please reply to this email not later than 8 days after this email was sent.
Thanks.
-Stefan
------
>From 266b030ef0bbf2986895ab789cdba90561af1ac8 Mon Sep 17 00:00:00 2001
From: Keith Packard <[email protected]>
Date: Thu, 7 Oct 2010 09:20:12 +0100
Subject: [PATCH 05/21] drm/i915: Free hardware status page on unload when physically mapped
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 <[email protected]>
Signed-off-by: Andi Kleen <[email protected]>
[ickle: call before tearing down registers on KMS-only path, as pointed
out by Dave Airlie]
Signed-off-by: Chris Wilson <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Stefan Bader <[email protected]>
---
drivers/gpu/drm/i915/i915_dma.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 7f13d50..2b2adb5 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1583,6 +1583,9 @@ int i915_driver_unload(struct drm_device *dev)
i915_gem_lastclose(dev);
intel_cleanup_overlay(dev);
+
+ if (!I915_NEED_GFX_HWS(dev))
+ i915_free_hws(dev);
}
pci_dev_put(dev_priv->bridge_dev);
--
1.7.0.4