]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
x86: change early_gart_iommu_check() back to any_mapped
authorYinghai Lu <yhlu.kernel@gmail.com>
Sat, 21 Jun 2008 10:50:47 +0000 (03:50 -0700)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 11:12:04 +0000 (13:12 +0200)
commit0754557d72c1fbfc5fcfd5235e7c23ae6f77248c
tree1c78c00b48b57a901b8d550ab30bef02e9bdc6d9
parent33ee375b2ea5dd11581a57d67bedd0ca39b19a5e
x86: change early_gart_iommu_check() back to any_mapped

Kevin Winchester reported a GART related direct rendering failure against
linux-next-20080611, which shows up via these log entries:

 PCI: Using ACPI for IRQ routing
 PCI: Cannot allocate resource region 0 of device 0000:00:00.0
 agpgart: Detected AGP bridge 0
 agpgart: Aperture conflicts with PCI mapping.
 agpgart: Aperture from AGP @ e0000000 size 128 MB
 agpgart: Aperture conflicts with PCI mapping.
 agpgart: No usable aperture found.
 agpgart: Consider rebooting with iommu=memaper=2 to get a good aperture.

instead of the expected:

 PCI: Using ACPI for IRQ routing
 agpgart: Detected AGP bridge 0
 agpgart: Aperture from AGP @ e0000000 size 128 MB

Kevin bisected it down to this change in tip/x86/gart:
"x86: checking aperture size order".

agp check is using request_mem_region(), and could fail if e820 is reserved...

change it back to e820_any_mapped().

Reported-and-bisected-by: "Kevin Winchester" <kjwinchester@gmail.com>
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Tested-by: Kevin Winchester <kjwinchester@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/aperture_64.c