i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel_gart: handle 64-bit PCI BARs

Browse Source
This commit is contained in:
Jérôme Duval
2022-03-14 16:19:51 +01:00
parent eb2b376271
commit d9df712ebc
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+17 -7
View File
@@ -609,11 +609,16 @@ intel_map(intel_info &info)
fbIndex = 2; fbIndex = 2;
} }
phys_addr_t addr = info.display.u.h0.base_registers[mmioIndex];
uint64 barSize = info.display.u.h0.base_register_sizes[mmioIndex];
if ((info.display.u.h0.base_register_flags[mmioIndex] & PCI_address_type) == PCI_address_type_64) {
addr |= (uint64)info.display.u.h0.base_registers[mmioIndex + 1] << 32;
barSize |= (uint64)info.display.u.h0.base_register_sizes[mmioIndex + 1] << 32;
}
AreaKeeper mmioMapper; AreaKeeper mmioMapper;
info.registers_area = mmioMapper.Map("intel GMCH mmio", info.registers_area = mmioMapper.Map("intel GMCH mmio", addr, barSize,
info.display.u.h0.base_registers[mmioIndex], B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, (void**)&info.registers);
info.display.u.h0.base_register_sizes[mmioIndex], B_ANY_KERNEL_ADDRESS,
B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, (void**)&info.registers);
if (mmioMapper.InitCheck() < B_OK) { if (mmioMapper.InitCheck() < B_OK) {
ERROR("could not map memory I/O!\n"); ERROR("could not map memory I/O!\n");
@@ -654,8 +659,7 @@ intel_map(intel_info &info)
info.gtt_physical_base = get_pci_config(info.display, i915_GTT_BASE, 4); info.gtt_physical_base = get_pci_config(info.display, i915_GTT_BASE, 4);
} else { } else {
// 945+? // 945+?
info.gtt_physical_base = info.display.u.h0.base_registers[mmioIndex] info.gtt_physical_base = addr + (2UL << 20);
+ (2UL << 20);
} }
size_t gttSize = determine_gtt_size(info); size_t gttSize = determine_gtt_size(info);
@@ -678,7 +682,13 @@ intel_map(intel_info &info)
info.aperture_physical_base = info.display.u.h0.base_registers[fbIndex]; info.aperture_physical_base = info.display.u.h0.base_registers[fbIndex];
info.aperture_stolen_size = stolenSize; info.aperture_stolen_size = stolenSize;
if (info.aperture_size == 0) if ((info.display.u.h0.base_register_flags[fbIndex] & PCI_address_type) == PCI_address_type_64) {
info.aperture_physical_base |= (uint64)info.display.u.h0.base_registers[fbIndex + 1] << 32;
if (info.aperture_size == 0) {
info.aperture_size = info.display.u.h0.base_register_sizes[fbIndex]
|= (uint64)info.display.u.h0.base_register_sizes[fbIndex + 1] << 32;
}
} else if (info.aperture_size == 0)
info.aperture_size = info.display.u.h0.base_register_sizes[fbIndex]; info.aperture_size = info.display.u.h0.base_register_sizes[fbIndex];
ERROR("detected %ld MB of stolen memory, aperture size %ld MB, " ERROR("detected %ld MB of stolen memory, aperture size %ld MB, "