diff options
| author | Luc Verhaegen <libv@skynet.be> | 2006-04-23 21:33:14 +0200 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2006-04-23 21:33:14 +0200 |
| commit | aeee25950086cff78ee93da343ee29e3544b68a7 (patch) | |
| tree | 7e61fad32ddd821aa159d6a9a291865ab9efa930 | |
| parent | 11828d059d1d5212d83e9496d0b8615b1180f9af (diff) | |
Remove MMIOInLinear, we can use pATI->Chips for that now.
| -rw-r--r-- | src/atimach64.c | 16 | ||||
| -rw-r--r-- | src/atipreinit.c | 4 | ||||
| -rw-r--r-- | src/atistruct.h | 1 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/atimach64.c b/src/atimach64.c index d5d1035..0c31744 100644 --- a/src/atimach64.c +++ b/src/atimach64.c @@ -98,19 +98,15 @@ ATIMach64PreInit if (pATI->Chip < ATI_CHIP_264VT4) pATIHW->bus_cntl = (pATIHW->bus_cntl & ~BUS_HOST_ERR_INT_EN) | BUS_HOST_ERR_INT; - if (pATI->Chip < ATI_CHIP_264VTB) - { + + /* We use MMIO in linear only below 264VT, but we only have the + * BUS_APER_REG_DIS bit from VTB on. */ + if (pATI->Chip < ATI_CHIP_264VTB) { pATIHW->bus_cntl &= ~(BUS_FIFO_ERR_INT_EN | BUS_ROM_DIS); pATIHW->bus_cntl |= SetBits(15, BUS_FIFO_WS) | BUS_FIFO_ERR_INT; - } - else if (pATI->MMIOInLinear) - { - pATIHW->bus_cntl &= ~BUS_APER_REG_DIS; - } - else - { + } else pATIHW->bus_cntl |= BUS_APER_REG_DIS; - } + if (pATI->Chip >= ATI_CHIP_264VT) pATIHW->bus_cntl |= BUS_EXT_REG_EN; /* Enable Block 1 */ diff --git a/src/atipreinit.c b/src/atipreinit.c index 3412ad1..0ba7c11 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -2001,7 +2001,7 @@ ATIPreInit(ScrnInfoPtr pScreenInfo, int flags) * Account for MMIO area at the tail end of the linear * aperture, if it is needed or if it cannot be disabled. */ - if (pATI->MMIOInLinear || (pATI->Chip < ATI_CHIP_264VTB)) + if (pATI->Chip < ATI_CHIP_264VTB) AcceleratorVideoRAM -= 2; ServerVideoRAM = pATI->VideoRAM; @@ -2042,7 +2042,7 @@ ATIPreInit(ScrnInfoPtr pScreenInfo, int flags) * mmap()'ed, but doing so currently causes the removal * of write combining for the entire aperture. */ - if (pATI->MMIOInLinear) + if (pATI->Chip < ATI_CHIP_264VT) AcceleratorVideoRAM -= AcceleratorVideoRAM % PageSize; #else /* if X_BYTE_ORDER != X_LITTLE_ENDIAN */ diff --git a/src/atistruct.h b/src/atistruct.h index e07754f..33c7cee 100644 --- a/src/atistruct.h +++ b/src/atistruct.h @@ -442,7 +442,6 @@ typedef struct _ATIRec * State flags. */ CARD8 Unlocked, Closeable; - CARD8 MMIOInLinear; /* * Wrapped functions. |