+++ /dev/null
-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;
-