Commit 4efd5d18 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://namesys.com/bk/reiser3-linux-2.5-resizer-fix

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 4c5254cd 3bdd213f
...@@ -67,7 +67,7 @@ static int mobile_vid_table[32] = { ...@@ -67,7 +67,7 @@ static int mobile_vid_table[32] = {
/* divide by 10 to get FID. */ /* divide by 10 to get FID. */
static int fid_codes[32] = { static int fid_codes[32] = {
110, 115, 120, 125, 50, 55, 60, 65, 110, 115, 120, 125, 50, 55, 60, 65,
70, 75, 80, 85, 90, 95, 10, 105, 70, 75, 80, 85, 90, 95, 100, 105,
30, 190, 40, 200, 130, 135, 140, 210, 30, 190, 40, 200, 130, 135, 140, 210,
150, 225, 160, 165, 170, 180, -1, -1, 150, 225, 160, 165, 170, 180, -1, -1,
}; };
......
...@@ -682,6 +682,14 @@ static int intel_815_configure(void) ...@@ -682,6 +682,14 @@ static int intel_815_configure(void)
u8 temp2; u8 temp2;
struct aper_size_info_8 *current_size; struct aper_size_info_8 *current_size;
/* attbase - aperture base */
/* the Intel 815 chipset spec. says that bits 29-31 in the
* ATTBASE register are reserved -> try not to write them */
if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) {
printk (KERN_EMERG "gatt bus addr too high");
return -EINVAL;
}
current_size = A_SIZE_8(agp_bridge->current_size); current_size = A_SIZE_8(agp_bridge->current_size);
/* aperture size */ /* aperture size */
...@@ -692,11 +700,6 @@ static int intel_815_configure(void) ...@@ -692,11 +700,6 @@ static int intel_815_configure(void)
pci_read_config_dword(agp_bridge->dev, INTEL_APBASE, &temp); pci_read_config_dword(agp_bridge->dev, INTEL_APBASE, &temp);
agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK); agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
/* attbase - aperture base */
/* the Intel 815 chipset spec. says that bits 29-31 in the
* ATTBASE register are reserved -> try not to write them */
if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK)
panic("gatt bus addr too high");
pci_read_config_dword(agp_bridge->dev, INTEL_ATTBASE, &addr); pci_read_config_dword(agp_bridge->dev, INTEL_ATTBASE, &addr);
addr &= INTEL_815_ATTBASE_MASK; addr &= INTEL_815_ATTBASE_MASK;
addr |= agp_bridge->gatt_bus_addr; addr |= agp_bridge->gatt_bus_addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment