summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-08 02:57:40 +0100
committerDave Airlie <airlied@linux.ie>2007-02-08 03:24:26 +0100
commit756db73df7b7d6b9f6421c1fb2e1cabeaede5846 (patch)
tree6354c8c17aca61778d4c937b5f29b01b9577d3ba /drivers/char
parentdrm: update core memory manager from git drm tree (diff)
downloadlinux-756db73df7b7d6b9f6421c1fb2e1cabeaede5846.tar.xz
linux-756db73df7b7d6b9f6421c1fb2e1cabeaede5846.zip
drm/via: Disable AGP DMA for chips with the new 3D engine.
Diffstat (limited to 'drivers/char')
-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,
return DRM_ERR(EFAULT);
}
+ if (dev_priv->chipset == VIA_DX9_0) {
+ DRM_ERROR("AGP DMA is not supported on this chip\n");
+ return DRM_ERR(EINVAL);
+ }
+
dev_priv->ring.map.offset = dev->agp->base + init->offset;
dev_priv->ring.map.size = init->size;
dev_priv->ring.map.type = 0;