diff options
Diffstat (limited to 'drivers/char/agp/amd64-agp.c')
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index d79d692d05b8..95326ac610f6 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -269,7 +269,6 @@ static int agp_aperture_valid(u64 aper, u32 size) | |||
269 | */ | 269 | */ |
270 | static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap) | 270 | static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap) |
271 | { | 271 | { |
272 | u32 aper_low, aper_hi; | ||
273 | u64 aper, nb_aper; | 272 | u64 aper, nb_aper; |
274 | int order = 0; | 273 | int order = 0; |
275 | u32 nb_order, nb_base; | 274 | u32 nb_order, nb_base; |
@@ -295,9 +294,7 @@ static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap) | |||
295 | apsize |= 0xf00; | 294 | apsize |= 0xf00; |
296 | order = 7 - hweight16(apsize); | 295 | order = 7 - hweight16(apsize); |
297 | 296 | ||
298 | pci_read_config_dword(agp, 0x10, &aper_low); | 297 | aper = pci_bus_address(agp, AGP_APERTURE_BAR); |
299 | pci_read_config_dword(agp, 0x14, &aper_hi); | ||
300 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); | ||
301 | 298 | ||
302 | /* | 299 | /* |
303 | * On some sick chips APSIZE is 0. This means it wants 4G | 300 | * On some sick chips APSIZE is 0. This means it wants 4G |