aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-05-06 09:04:52 +1000
committerDave Airlie <airlied@redhat.com>2009-05-06 09:04:52 +1000
commit42beefc0093725ec0f8cea340cc54c36ccaceea0 (patch)
tree837a528b509ed1558b489c4925d07b4282030731
parent3788f48a0fad246dbab826e8b2f07b403b0e3279 (diff)
downloadlinux-linaro-android-42beefc0093725ec0f8cea340cc54c36ccaceea0.tar.gz
drm/r128: fix r128 ioremaps to use ioremap_wc.
This should allow r128 to start working again since PAT changes. taken from F-11 kernel. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/r128/r128_cce.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 32de4cedc36..077c0455a6b 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
#if __OS_HAS_AGP
if (!dev_priv->is_pci) {
- drm_core_ioremap(dev_priv->cce_ring, dev);
- drm_core_ioremap(dev_priv->ring_rptr, dev);
- drm_core_ioremap(dev->agp_buffer_map, dev);
+ drm_core_ioremap_wc(dev_priv->cce_ring, dev);
+ drm_core_ioremap_wc(dev_priv->ring_rptr, dev);
+ drm_core_ioremap_wc(dev->agp_buffer_map, dev);
if (!dev_priv->cce_ring->handle ||
!dev_priv->ring_rptr->handle ||
!dev->agp_buffer_map->handle) {