git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
char
/
agp
/
amd64-agp.c
diff --git
a/drivers/char/agp/amd64-agp.c
b/drivers/char/agp/amd64-agp.c
index
eca1c4f
..
1407945
100644
(file)
--- a/
drivers/char/agp/amd64-agp.c
+++ b/
drivers/char/agp/amd64-agp.c
@@
-106,7
+106,8
@@
static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
}
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
}
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
- tmp = agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
+ tmp = agp_bridge->driver->mask_memory(agp_bridge,
+ mem->memory[i], mem->type);
BUG_ON(tmp & 0xffffff0000000ffcULL);
pte = (tmp & 0x000000ff00000000ULL) >> 28;
BUG_ON(tmp & 0xffffff0000000ffcULL);
pte = (tmp & 0x000000ff00000000ULL) >> 28;
@@
-218,7
+219,7
@@
static struct aper_size_info_32 amd_8151_sizes[7] =
static int amd_8151_configure(void)
{
static int amd_8151_configure(void)
{
- unsigned long gatt_bus = virt_to_
phys
(agp_bridge->gatt_table_real);
+ unsigned long gatt_bus = virt_to_
gart
(agp_bridge->gatt_table_real);
/* Configure AGP regs in each x86-64 host bridge. */
for_each_nb() {
/* Configure AGP regs in each x86-64 host bridge. */
for_each_nb() {
@@
-242,7
+243,7
@@
static void amd64_cleanup(void)
}
}
-struct agp_bridge_driver amd_8151_driver = {
+st
atic st
ruct agp_bridge_driver amd_8151_driver = {
.owner = THIS_MODULE,
.aperture_sizes = amd_8151_sizes,
.size_type = U32_APER_SIZE,
.owner = THIS_MODULE,
.aperture_sizes = amd_8151_sizes,
.size_type = U32_APER_SIZE,
@@
-590,7
+591,7
@@
static void __devexit agp_amd64_remove(struct pci_dev *pdev)
{
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
{
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
- release_mem_region(virt_to_
phys
(bridge->gatt_table_real),
+ release_mem_region(virt_to_
gart
(bridge->gatt_table_real),
amd64_aperture_sizes[bridge->aperture_size_idx].size);
agp_remove_bridge(bridge);
agp_put_bridge(bridge);
amd64_aperture_sizes[bridge->aperture_size_idx].size);
agp_remove_bridge(bridge);
agp_put_bridge(bridge);
@@
-709,7
+710,7
@@
int __init agp_amd64_init(void)
if (agp_off)
return -EINVAL;
if (agp_off)
return -EINVAL;
- if (pci_
module_init
(&agp_amd64_pci_driver) > 0) {
+ if (pci_
register_driver
(&agp_amd64_pci_driver) > 0) {
struct pci_dev *dev;
if (!agp_try_unsupported && !agp_try_unsupported_boot) {
printk(KERN_INFO PFX "No supported AGP bridge found.\n");
struct pci_dev *dev;
if (!agp_try_unsupported && !agp_try_unsupported_boot) {
printk(KERN_INFO PFX "No supported AGP bridge found.\n");