mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Make the initialization in the AGPv3 case match that of Linux. Fixes hangs on

Browse Source 
X startup with DRI enabled, with a v3-capable card.

Tested by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Approved by:	re (scottl)
This commit is contained in:
Eric Anholt 2005-06-26 04:01:11 +00:00
parent 68d376254c
commit 11b0d58251
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147606
2 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/dev/agp/agp_via.c
View File

@ -211,11 +211,22 @@ agp_via_attach(device_t dev)
}
sc->gatt = gatt;
/* Install the gatt. */
pci_write_config(dev, sc->regs[REG_ATTBASE], gatt->ag_physical | 3, 4);
/* Enable the aperture. */
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
if (sc->regs == via_v2_regs) {
/* Install the gatt. */
pci_write_config(dev, sc->regs[REG_ATTBASE], gatt->ag_physical | 3, 4);
/* Enable the aperture. */
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
} else {
u_int32_t gartctrl;
/* Install the gatt. */
pci_write_config(dev, sc->regs[REG_ATTBASE], gatt->ag_physical, 4);
/* Enable the aperture. */
gartctrl = pci_read_config(dev, sc->regs[REG_ATTBASE], 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl | (3 << 7), 4);
}
return 0;
}
@ -306,9 +317,18 @@ static void
agp_via_flush_tlb(device_t dev)
{
struct agp_via_softc *sc = device_get_softc(dev);
u_int32_t gartctrl;
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x8f, 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
if (sc->regs == via_v2_regs) {
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x8f, 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
} else {
gartctrl = pci_read_config(dev, sc->regs[REG_GARTCTRL], 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl &
~(1 << 7), 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl, 4);
}
}
static device_method_t agp_via_methods[] = {

34
sys/pci/agp_via.c
View File

@ -211,11 +211,22 @@ agp_via_attach(device_t dev)
}
sc->gatt = gatt;
/* Install the gatt. */
pci_write_config(dev, sc->regs[REG_ATTBASE], gatt->ag_physical | 3, 4);
/* Enable the aperture. */
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
if (sc->regs == via_v2_regs) {
/* Install the gatt. */
pci_write_config(dev, sc->regs[REG_ATTBASE], gatt->ag_physical | 3, 4);
/* Enable the aperture. */
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
} else {
u_int32_t gartctrl;
/* Install the gatt. */
pci_write_config(dev, sc->regs[REG_ATTBASE], gatt->ag_physical, 4);
/* Enable the aperture. */
gartctrl = pci_read_config(dev, sc->regs[REG_ATTBASE], 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl | (3 << 7), 4);
}
return 0;
}
@ -306,9 +317,18 @@ static void
agp_via_flush_tlb(device_t dev)
{
struct agp_via_softc *sc = device_get_softc(dev);
u_int32_t gartctrl;
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x8f, 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
if (sc->regs == via_v2_regs) {
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x8f, 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], 0x0f, 4);
} else {
gartctrl = pci_read_config(dev, sc->regs[REG_GARTCTRL], 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl &
~(1 << 7), 4);
pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl, 4);
}
}
static device_method_t agp_via_methods[] = {