summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-01-08 13:09:12 +1100
committerDave Airlie <airlied@linux.ie>2007-01-08 13:09:51 +1100
commit5bf60c9d6c2e04a65085a0a332de24b06043fcb8 (patch)
tree5a9cc9b33fcd4ec0330cc25ec5d970cc7f16fd9b /linux-core
parent26bf6d9b5b5be19973f6da4f5ed292c7f83de099 (diff)
i830: complete fix for i830 maps
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i830_dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index e35551b9..e93307fb 100644
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -323,7 +323,7 @@ static int i830_freelist_init(drm_device_t * dev, drm_i830_private_t * dev_priv)
buf_priv->map.offset = buf->bus_address;
buf_priv->map.size = buf->total;
- buf_priv->map.type = 0;
+ buf_priv->map.type = _DRM_AGP;
buf_priv->map.flags = 0;
buf_priv->map.mtrr = 0;
@@ -380,9 +380,9 @@ static int i830_dma_initialize(drm_device_t * dev,
dev_priv->ring.End = init->ring_end;
dev_priv->ring.Size = init->ring_size;
- dev_priv->ring.map.offset = init->ring_start;
+ dev_priv->ring.map.offset = dev->agp->base + init->ring_start;
dev_priv->ring.map.size = init->ring_size;
- dev_priv->ring.map.type = 0;
+ dev_priv->ring.map.type = _DRM_AGP;
dev_priv->ring.map.flags = 0;
dev_priv->ring.map.mtrr = 0;