]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
remove drm patch, as it is x86 only.
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 28 Jul 2008 21:38:16 +0000 (14:38 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 28 Jul 2008 21:38:16 +0000 (14:38 -0700)
queue-2.6.26/drm-radeon-fixup-issue-with-radeon-and-pat-support.patch [deleted file]
queue-2.6.26/series

diff --git a/queue-2.6.26/drm-radeon-fixup-issue-with-radeon-and-pat-support.patch b/queue-2.6.26/drm-radeon-fixup-issue-with-radeon-and-pat-support.patch
deleted file mode 100644 (file)
index d65169a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From stable-bounces@linux.kernel.org Mon Jul 14 23:38:14 2008
-From: Dave Airlie <airlied@linux.ie>
-Date: Tue, 15 Jul 2008 07:05:59 +0100 (IST)
-Subject: drm/radeon: fixup issue with radeon and PAT support.
-To: stable@kernel.org
-Message-ID: <alpine.DEB.0.82.0807150704470.6038@skynet.skynet.ie>
-
-From: Dave Airlie <airlied@linux.ie>
-
-commit 242e3df80b8d25ed681c278512df0993725f25dd upstream
-
-With new userspace libpciaccess we can get a conflicting mapping
-on the PCIE GART table in the video RAM. Always try and map it _wc.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/char/drm/drmP.h       |    1 +
- drivers/char/drm/drm_memory.c |    5 +++++
- drivers/char/drm/radeon_cp.c  |    2 +-
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/char/drm/drm_memory.c
-+++ b/drivers/char/drm/drm_memory.c
-@@ -167,6 +167,11 @@ void drm_core_ioremap(struct drm_map *ma
- }
- EXPORT_SYMBOL(drm_core_ioremap);
-+void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev)
-+{
-+      map->handle = ioremap_wc(map->offset, map->size);
-+}
-+EXPORT_SYMBOL(drm_core_ioremap_wc);
- void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev)
- {
-       if (!map->handle || !map->size)
---- a/drivers/char/drm/drmP.h
-+++ b/drivers/char/drm/drmP.h
-@@ -1089,6 +1089,7 @@ extern int drm_mm_remove_space_from_tail
- extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);
- extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);
-+extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev);
- extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);
- static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
---- a/drivers/char/drm/radeon_cp.c
-+++ b/drivers/char/drm/radeon_cp.c
-@@ -1154,7 +1154,7 @@ static int radeon_do_init_cp(struct drm_
-                       dev_priv->gart_info.mapping.size =
-                           dev_priv->gart_info.table_size;
--                      drm_core_ioremap(&dev_priv->gart_info.mapping, dev);
-+                      drm_core_ioremap_wc(&dev_priv->gart_info.mapping, dev);
-                       dev_priv->gart_info.addr =
-                           dev_priv->gart_info.mapping.handle;
index 39fa73746850282d5366a0e9016de3da011be416..a707c4d4c1ac7d0babc3fa997682e9120026404e 100644 (file)
@@ -17,7 +17,6 @@ rcu-fix-rcu_try_flip_waitack_needed-to-prevent-grace-period-stall.patch
 fix-typos-from-signal_32-64.h-merge.patch
 x86-reboot-quirks-add-dell-precision-workstation-t5400.patch
 usb-fix-usb-serial-pm-counter-decrement-for-disconnected-interfaces.patch
-drm-radeon-fixup-issue-with-radeon-and-pat-support.patch
 x86-suspend-acpi-enter-big-real-mode.patch
 markers-fix-duplicate-modpost-entry.patch
 fix-build-on-compat-platforms-when-config_epoll-is-disabled.patch