summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorsborrill <sborrill@NetBSD.org>2007-06-20 08:17:12 +0000
committersborrill <sborrill@NetBSD.org>2007-06-20 08:17:12 +0000
commit8d4b49cb311f00fa3a76dc560f16d3dbb237c10e (patch)
tree9cd88ebb55cba998cdd03cfe41638320794d202f /sys/dev
parent67a9c3250c78dc9838c76a55072e00e19977a413 (diff)
Support more i915 stolen memory configurations (previous limit was 8MB,
some configurations steal up to 64MB). OK christos@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/agp_i810.c16
-rw-r--r--sys/dev/pci/agpreg.h6
2 files changed, 19 insertions, 3 deletions
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index b9c8d68ef04..cef2c1fcf4e 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.40 2007/03/24 23:02:24 christos Exp $ */
+/* $NetBSD: agp_i810.c,v 1.41 2007/06/20 08:17:12 sborrill Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.40 2007/03/24 23:02:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.41 2007/06/20 08:17:12 sborrill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -379,6 +379,18 @@ agp_i810_attach(struct device *parent, struct device *self, void *aux)
case AGP_I915_GCC1_GMS_STOLEN_8M:
isc->stolen = (8192 - 260) * 1024 / 4096;
break;
+ case AGP_I915_GCC1_GMS_STOLEN_16M:
+ isc->stolen = (16384 - 260) * 1024 / 4096;
+ break;
+ case AGP_I915_GCC1_GMS_STOLEN_32M:
+ isc->stolen = (32768 - 260) * 1024 / 4096;
+ break;
+ case AGP_I915_GCC1_GMS_STOLEN_48M:
+ isc->stolen = (49152 - 260) * 1024 / 4096;
+ break;
+ case AGP_I915_GCC1_GMS_STOLEN_64M:
+ isc->stolen = (65536 - 260) * 1024 / 4096;
+ break;
default:
isc->stolen = 0;
aprint_error(
diff --git a/sys/dev/pci/agpreg.h b/sys/dev/pci/agpreg.h
index 482a4ca36af..4a601afeba8 100644
--- a/sys/dev/pci/agpreg.h
+++ b/sys/dev/pci/agpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: agpreg.h,v 1.11 2007/03/27 00:34:16 jmcneill Exp $ */
+/* $NetBSD: agpreg.h,v 1.12 2007/06/20 08:17:12 sborrill Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -224,6 +224,10 @@
#define AGP_I915_GCC1_GMS_STOLEN_0M 0x00
#define AGP_I915_GCC1_GMS_STOLEN_1M 0x10
#define AGP_I915_GCC1_GMS_STOLEN_8M 0x30
+#define AGP_I915_GCC1_GMS_STOLEN_16M 0x40
+#define AGP_I915_GCC1_GMS_STOLEN_32M 0x50
+#define AGP_I915_GCC1_GMS_STOLEN_48M 0x60
+#define AGP_I915_GCC1_GMS_STOLEN_64M 0x70
#define AGP_I915_MSAC 0x62
#define AGP_I915_MSAC_APER_128M 0x02