From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu, 8 Feb 2007 01:57:40 +0000 (+1100)
Subject: drm/via: Disable AGP DMA for chips with the new 3D engine.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=756db73df7b7d6b9f6421c1fb2e1cabeaede5846;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

drm/via: Disable AGP DMA for chips with the new 3D engine.
---

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;