]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Free hardware status page on unload when physically mapped
authorKeith Packard <keithp@keithp.com>
Thu, 7 Oct 2010 08:20:12 +0000 (09:20 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 7 Oct 2010 09:00:18 +0000 (10:00 +0100)
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 <keithp@keithp.com>
[ickle: call before tearing down registers on KMS-only path, as pointed
out by Dave Airlie]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
drivers/gpu/drm/i915/i915_dma.c

index 726c3736082ff0ceb57dc952b671a95109267dde..3bbe72352cd88ac381e2dd01b9ac8567251c38fd 100644 (file)
@@ -2150,6 +2150,9 @@ int i915_driver_unload(struct drm_device *dev)
                drm_mm_takedown(&dev_priv->mm.vram);
 
                intel_cleanup_overlay(dev);
+
+               if (!I915_NEED_GFX_HWS(dev))
+                       i915_free_hws(dev);
        }
 
        intel_teardown_gmbus(dev);