diff --git a/[refs] b/[refs]
index 3080470b82d5..524783c3234c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d58420bad15d08f93bf1e0342c1b1d1234d69b7
+refs/heads/master: 756db73df7b7d6b9f6421c1fb2e1cabeaede5846
diff --git a/trunk/drivers/char/drm/via_dma.c b/trunk/drivers/char/drm/via_dma.c
index 2f72cbefc2ff..c0539c6299cf 100644
--- a/trunk/drivers/char/drm/via_dma.c
+++ b/trunk/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;