Commit 8d713770 authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] Previous AGPv3 SiS fixes broke AGPv2 users. Oops.

parent a1415c9e
...@@ -227,9 +227,7 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge) ...@@ -227,9 +227,7 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge)
{ {
if (bridge->dev->device == PCI_DEVICE_ID_SI_648 || if (bridge->dev->device == PCI_DEVICE_ID_SI_648 ||
bridge->dev->device == PCI_DEVICE_ID_SI_746) { bridge->dev->device == PCI_DEVICE_ID_SI_746) {
if (agp_bridge->major_version == 3 && agp_bridge->minor_version < 5) { if (agp_bridge->major_version == 3) {
sis_driver.agp_enable=sis_648_enable;
} else {
sis_driver.agp_enable = sis_648_enable; sis_driver.agp_enable = sis_648_enable;
sis_driver.aperture_sizes = agp3_generic_sizes; sis_driver.aperture_sizes = agp3_generic_sizes;
sis_driver.size_type = U16_APER_SIZE; sis_driver.size_type = U16_APER_SIZE;
...@@ -238,6 +236,8 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge) ...@@ -238,6 +236,8 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge)
sis_driver.fetch_size = agp3_generic_fetch_size; sis_driver.fetch_size = agp3_generic_fetch_size;
sis_driver.cleanup = agp3_generic_cleanup; sis_driver.cleanup = agp3_generic_cleanup;
sis_driver.tlb_flush = agp3_generic_tlbflush; sis_driver.tlb_flush = agp3_generic_tlbflush;
} else {
sis_driver.agp_enable=sis_648_enable;
} }
} }
} }
......
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