Commit 185fdfa0 authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] Fix SiS 746 again.

Turns out that this chipset won't work in AGPv3 mode with the generic AGPv3 routines.
*somehow*, it works in AGPv3 mode with AGPv2 aperture sizing etc. Very, very strange.
Still, until we get some docs from SiS, some support is better than none.
parent 8d713770
...@@ -225,10 +225,9 @@ static struct agp_device_ids sis_agp_device_ids[] __devinitdata = ...@@ -225,10 +225,9 @@ static struct agp_device_ids sis_agp_device_ids[] __devinitdata =
static void __devinit sis_get_driver(struct agp_bridge_data *bridge) 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) { sis_driver.agp_enable=sis_648_enable;
if (agp_bridge->major_version == 3) { if (agp_bridge->major_version == 3) {
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;
sis_driver.num_aperture_sizes = AGP_GENERIC_SIZES_ENTRIES; sis_driver.num_aperture_sizes = AGP_GENERIC_SIZES_ENTRIES;
...@@ -236,10 +235,17 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge) ...@@ -236,10 +235,17 @@ 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;
} }
} }
if (bridge->dev->device == PCI_DEVICE_ID_SI_746) {
/*
* We don't know enough about the 746 to enable it properly.
* Though we do know that it needs the 'delay' hack to settle
* after changing modes.
*/
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