2 ===================================================================
3 RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v
4 retrieving revision 1.8
6 --- XFree86-4.0.3/xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h 2000/12/08 19:15:33 1.8
7 +++ XFree86-4.0.3/xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h 2001/03/02 20:16:38
9 unsigned char *AGP; /* Map */
14 Bool CCEInUse; /* CCE is currently active */
15 int CCEMode; /* CCE mode that server/clients use */
16 int CCEFifoSize; /* Size of the CCE command FIFO */
18 ===================================================================
19 RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c,v
20 retrieving revision 1.7
21 diff -u -r1.7 r128_dri.c
22 --- XFree86-4.0.3/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2000/12/12 17:17:12 1.7
23 +++ XFree86-4.0.3/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2001/03/02 20:16:38
28 + /* Save the old PCI command reg */
29 + info->pciCommand = pciReadLong(info->PciTag, PCI_CMD_STAT_REG);
31 if (drmAgpAcquire(info->drmFD) < 0) {
32 xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] AGP not available\n");
35 OUTREG(R128_AGP_BASE, info->ringHandle); /* Ring buf is at AGP offset 0 */
36 OUTREG(R128_AGP_CNTL, cntl);
38 + /* Enable bus mastering in PCI config
40 + pciWriteLong(info->PciTag, PCI_CMD_STAT_REG,
41 + info->pciCommand | PCI_CMD_MASTER_ENABLE);
47 drmAgpFree(info->drmFD, info->agpMemHandle);
48 info->agpMemHandle = 0;
49 drmAgpRelease(info->drmFD);
51 + /* Restore PCI command register */
52 + pciWriteLong(info->PciTag, PCI_CMD_STAT_REG, info->pciCommand);
55 /* De-allocate all DRI resources */