[coreboot] [commit] r5807 - trunk/src/northbridge/amd/amdfam10

[repository service]

Author: myles
Date: Mon Sep 13 16:49:02 2010
New Revision: 5807
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5807

Log:
Port k8 UMA handling to fam10.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Myles Watson <mylesgw at gmail.com>

Modified:
   trunk/src/northbridge/amd/amdfam10/northbridge.c

Modified: trunk/src/northbridge/amd/amdfam10/northbridge.c
==============================================================================
--- trunk/src/northbridge/amd/amdfam10/northbridge.c	Mon Sep 13 16:47:22 2010	(r5806)
+++ trunk/src/northbridge/amd/amdfam10/northbridge.c	Mon Sep 13 16:49:02 2010	(r5807)
@@ -865,6 +865,9 @@
 #if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
+#if CONFIG_GFXUMA == 1
+extern uint64_t uma_memory_base, uma_memory_size;
+#endif
 #endif
 
 static void amdfam10_domain_set_resources(device_t dev)
@@ -1038,7 +1041,11 @@
 #if CONFIG_WRITE_HIGH_TABLES==1
 					if (high_tables_base==0) {
 					/* Leave some space for ACPI, PIRQ and MP tables */
+#if CONFIG_GFXUMA == 1
+						high_tables_base = uma_memory_base - (HIGH_TABLES_SIZE * 1024);
+#else
 						high_tables_base = (mmio_basek - HIGH_TABLES_SIZE) * 1024;
+#endif
 						high_tables_size = HIGH_TABLES_SIZE * 1024;
 						printk(BIOS_DEBUG, " split: %dK table at =%08llx\n", HIGH_TABLES_SIZE,
 							     high_tables_base);
@@ -1073,7 +1080,11 @@
 			     i, mmio_basek, basek, limitk);
 		if (high_tables_base==0) {
 		/* Leave some space for ACPI, PIRQ and MP tables */
+#if CONFIG_GFXUMA == 1
+			high_tables_base = uma_memory_base - (HIGH_TABLES_SIZE * 1024);
+#else
 			high_tables_base = (limitk - HIGH_TABLES_SIZE) * 1024;
+#endif
 			high_tables_size = HIGH_TABLES_SIZE * 1024;
 		}
 #endif