[kernel] r16719 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 10:28:30 2010
New Revision: 16719

Log:
drm/i915: Free hardware status page on unload when physically mapped

Bugfix from 2.6.35.10 without changes

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:25 2010	(r16718)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:30 2010	(r16719)
@@ -20,6 +20,7 @@
   * drm/radeon/kms: MC vram map needs to be >= pci aperture size.
   * drm/radeon/kms: make sure blit addr masks are 64 bit.
   * drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx.
+  * drm/i915: Free hardware status page on unload when physically mapped.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch	Mon Dec 20 10:28:30 2010	(r16719)
@@ -0,0 +1,38 @@
+From c2873e9633fe908dccd36dbb1d370e9c59a1ca62 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp at keithp.com>
+Date: Thu, 7 Oct 2010 09:20:12 +0100
+Subject: drm/i915: Free hardware status page on unload when physically mapped
+
+From: Keith Packard <keithp at keithp.com>
+
+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 <keithp at keithp.com>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+[ickle: call before tearing down registers on KMS-only path, as pointed
+out by Dave Airlie]
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ 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);

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:25 2010	(r16718)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:30 2010	(r16719)
@@ -8,3 +8,4 @@
 + bugfix/all/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.patch
 + bugfix/all/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
 + bugfix/all/drm-radeon-kms-fix-handling-of-tex-lookup-disable-in-cs-checker-on-r2xx.patch
++ bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch