aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-07 20:57:40 -0500
committerDave Airlie <airlied@linux.ie>2007-02-07 21:24:26 -0500
commit756db73df7b7d6b9f6421c1fb2e1cabeaede5846 (patch)
tree6354c8c17aca61778d4c937b5f29b01b9577d3ba /drivers/char/drm
parent1d58420bad15d08f93bf1e0342c1b1d1234d69b7 (diff)
drm/via: Disable AGP DMA for chips with the new 3D engine.
Diffstat (limited to 'drivers/char/drm')
-rw-r--r--drivers/char/drm/via_dma.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index 2f72cbefc2ff..c0539c6299cf 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -190,6 +190,11 @@ static int via_initialize(drm_device_t * dev,
190 return DRM_ERR(EFAULT); 190 return DRM_ERR(EFAULT);
191 } 191 }
192 192
193 if (dev_priv->chipset == VIA_DX9_0) {
194 DRM_ERROR("AGP DMA is not supported on this chip\n");
195 return DRM_ERR(EINVAL);
196 }
197
193 dev_priv->ring.map.offset = dev->agp->base + init->offset; 198 dev_priv->ring.map.offset = dev->agp->base + init->offset;
194 dev_priv->ring.map.size = init->size; 199 dev_priv->ring.map.size = init->size;
195 dev_priv->ring.map.type = 0; 200 dev_priv->ring.map.type = 0;