aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-02-25 15:55:01 -0500
committerDave Airlie <airlied@redhat.com>2009-03-13 00:24:12 -0400
commit7659e9804b7a66047433182d86393d38ba4eff79 (patch)
tree916713e2d4e812810a9ce071acd477555aad6936
parent7335aafa30ecf39ede7f24bd2036dfbf4c25f269 (diff)
radeon: fix r600 AGP support
This fixes the ioremap issues with r600 AGP. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/r600_cp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index fcb0fc164c39..3f40558beece 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -1932,9 +1932,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
1932#if __OS_HAS_AGP 1932#if __OS_HAS_AGP
1933 /* XXX */ 1933 /* XXX */
1934 if (dev_priv->flags & RADEON_IS_AGP) { 1934 if (dev_priv->flags & RADEON_IS_AGP) {
1935 drm_core_ioremap(dev_priv->cp_ring, dev); 1935 drm_core_ioremap_wc(dev_priv->cp_ring, dev);
1936 drm_core_ioremap(dev_priv->ring_rptr, dev); 1936 drm_core_ioremap_wc(dev_priv->ring_rptr, dev);
1937 drm_core_ioremap(dev->agp_buffer_map, dev); 1937 drm_core_ioremap_wc(dev->agp_buffer_map, dev);
1938 if (!dev_priv->cp_ring->handle || 1938 if (!dev_priv->cp_ring->handle ||
1939 !dev_priv->ring_rptr->handle || 1939 !dev_priv->ring_rptr->handle ||
1940 !dev->agp_buffer_map->handle) { 1940 !dev->agp_buffer_map->handle) {