Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: gart iommu have direct mapping when agp is present too
+11
-9
+11
-9
arch/x86/kernel/pci-gart_64.c
+11
-9
arch/x86/kernel/pci-gart_64.c
···
626
626
struct pci_dev *dev;
627
627
void *gatt;
628
628
int i, error;
629
-
unsigned long start_pfn, end_pfn;
630
629
631
630
printk(KERN_INFO "PCI-DMA: Disabling AGP.\n");
632
631
aper_size = aper_base = info->aper_size = 0;
···
671
672
printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n",
672
673
aper_base, aper_size>>10);
673
674
674
-
/* need to map that range */
675
-
end_pfn = (aper_base>>PAGE_SHIFT) + (aper_size>>PAGE_SHIFT);
676
-
if (end_pfn > max_low_pfn_mapped) {
677
-
start_pfn = (aper_base>>PAGE_SHIFT);
678
-
init_memory_mapping(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);
679
-
}
680
675
return 0;
681
676
682
677
nommu:
···
720
727
{
721
728
struct agp_kern_info info;
722
729
unsigned long iommu_start;
723
-
unsigned long aper_size;
730
+
unsigned long aper_base, aper_size;
731
+
unsigned long start_pfn, end_pfn;
724
732
unsigned long scratch;
725
733
long i;
726
734
···
759
765
return;
760
766
}
761
767
768
+
/* need to map that range */
769
+
aper_size = info.aper_size << 20;
770
+
aper_base = info.aper_base;
771
+
end_pfn = (aper_base>>PAGE_SHIFT) + (aper_size>>PAGE_SHIFT);
772
+
if (end_pfn > max_low_pfn_mapped) {
773
+
start_pfn = (aper_base>>PAGE_SHIFT);
774
+
init_memory_mapping(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);
775
+
}
776
+
762
777
printk(KERN_INFO "PCI-DMA: using GART IOMMU.\n");
763
-
aper_size = info.aper_size * 1024 * 1024;
764
778
iommu_size = check_iommu_size(info.aper_base, aper_size);
765
779
iommu_pages = iommu_size >> PAGE_SHIFT;
766
780