From e47169027109ed94ec7a1485e8e6fa52df5271c4 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Wed, 13 Jan 2010 15:16:39 +0100
Subject: [PATCH] --- yaml --- r: 179901 b: refs/heads/master c:
 0a3f316370da07fcdb11fde4f5a683d60713b7fd h: refs/heads/master i:   179899:
 18913f62b12eff016b471f5ab15938f2928a2749 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_agp.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f9eca5240cc3..319ef4d03fde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30d2d9a54d48e4fefede0389ded1b6fc2d44a522
+refs/heads/master: 0a3f316370da07fcdb11fde4f5a683d60713b7fd
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_agp.c b/trunk/drivers/gpu/drm/radeon/radeon_agp.c
index 220f454ea9fa..c9ad7f5cc1ac 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_agp.c
@@ -133,6 +133,13 @@ int radeon_agp_init(struct radeon_device *rdev)
 	bool is_v3;
 	int ret;
 
+	if (rdev->ddev->agp->agp_info.aper_size < 32) {
+		dev_warn(rdev->dev, "AGP aperture to small (%dM) "
+			"need at least 32M, disabling AGP\n",
+			rdev->ddev->agp->agp_info.aper_size);
+		return -EINVAL;
+	}
+
 	/* Acquire AGP. */
 	if (!rdev->ddev->agp->acquired) {
 		ret = drm_agp_acquire(rdev->ddev);