1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index 249fdff305c6..aeace37415aa 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -1193,6 +1193,10 @@ static int i810_flip_bufs(struct drm_device *dev, void *data,
 
 int i810_driver_load(struct drm_device *dev, unsigned long flags)
 {
+        /* Our userspace depends upon the agp mapping support. */
+        if (!dev->agp)
+                return -EINVAL;
+
         pci_set_master(dev->pdev);
 
         return 0;