On Wed, Nov 19, 2003 at 11:17:17AM -0800, James Jones wrote: > diff -ruN linux-2.6.0-test7/arch/x86_64/kernel/pci-gart.c > linux-2.6.0-test7-fixed/arch/x86_64/kernel/pci-gart.c > --- linux-2.6.0-test7/arch/x86_64/kernel/pci-gart.c 2003-10-08 12:24:04.000000000 > -0700 > +++ linux-2.6.0-test7-fixed/arch/x86_64/kernel/pci-gart.c 2003-10-09 > 04:40:44.179994208 -0700 > @@ -681,7 +681,7 @@ > unsigned long iommu_start; > struct pci_dev *dev; > > -#ifndef CONFIG_AGP_AMD_8151 > +#ifndef CONFIG_AGP_AMD64 > no_agp = 1;
Already in agpgart bitkeeper tree. Waiting for Linus to pull. Andi also sent this to Linus.. > /* Makefile puts PCI initialization via subsys_initcall first. */ > diff -ruN linux-2.6.0-test7/drivers/char/agp/amd64-agp.c > linux-2.6.0-test7-fixed/drivers/char/agp/amd64-agp.c > --- linux-2.6.0-test7/drivers/char/agp/amd64-agp.c 2003-10-08 12:24:17.000000000 > -0700 > +++ linux-2.6.0-test7-fixed/drivers/char/agp/amd64-agp.c 2003-10-09 > 04:41:44.563814472 -0700 > @@ -355,12 +355,14 @@ > #endif > return -1; > } > - hammers[i++] = loop_dev; > - nr_garts = i; > + > if (i == MAX_HAMMER_GARTS) { > printk(KERN_INFO PFX "Too many northbridges for AGP\n"); > return -1; > } > + > + hammers[i++] = loop_dev; > + nr_garts = i; > } > return i == 0 ? -1 : 0; > } The current code in -bk looks like this, which should do the right thing on SMP and UP.. Can you confirm ? Dave ... hammers[i++] = loop_dev; nr_garts = i; #ifdef CONFIG_SMP if (i == MAX_HAMMER_GARTS) { printk(KERN_INFO PFX "Too many northbridges for AGP\n"); return -1; } #else /* Uniprocessor case, return after finding first bridge. (There may be more, but in UP, we don't care). */ return 0; #endif } return i == 0 ? -1 : 0; } ------------------------------------------------------- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel