From e0fc400b681cb6b04ba0769c58f279a2aa4326a5 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sun, 8 May 2005 20:33:04 +0000
Subject: VIA: Fix for oops when AGP ring-buffer initialization is called and
 there     is no AGP memory acquired.

---
 shared/via_dma.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'shared/via_dma.c')

diff --git a/shared/via_dma.c b/shared/via_dma.c
index c6c14dc0..672552e4 100644
--- a/shared/via_dma.c
+++ b/shared/via_dma.c
@@ -189,6 +189,12 @@ static int via_initialize(drm_device_t * dev,
 		return DRM_ERR(EFAULT);
 	}
 
+	if (!dev->agp || !dev->agp->base) {
+		DRM_ERROR("%s called with no agp memory available\n", 
+			  __FUNCTION__);
+		return DRM_ERR(EFAULT);
+	}
+
 	dev_priv->ring.map.offset = dev->agp->base + init->offset;
 	dev_priv->ring.map.size = init->size;
 	dev_priv->ring.map.type = 0;
-- 
cgit v1.2.3