frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreak the AGP DRI case. That was quite a pile of broken code.

This commit is contained in:
Eric Anholt 2004-09-19 10:57:31 +00:00
parent 9297c6149f
commit 90ff3688cd
2 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hw/kdrive/ati/ati_dri.c
View File

@ -241,13 +241,8 @@ ATIDRIAgpInit(ScreenPtr pScreen)
unsigned char *mmio = atic->reg_base; unsigned char *mmio = atic->reg_base;
unsigned long mode; unsigned long mode;
int ret; int ret;
unsigned long agpBase;
CARD32 cntl, chunk; CARD32 cntl, chunk;
/* AGP DRI seems broken on my R128, not sure why. */
if (!atic->is_radeon)
return FALSE;
if (drmAgpAcquire(atic->drmFd) < 0) { if (drmAgpAcquire(atic->drmFd) < 0) {
ErrorF("[agp] AGP not available\n"); ErrorF("[agp] AGP not available\n");
return FALSE; return FALSE;
@ -255,30 +250,21 @@ ATIDRIAgpInit(ScreenPtr pScreen)
ATIDRIInitGARTValues(pScreen); ATIDRIInitGARTValues(pScreen);
/* Modify the mode if the default mode is not appropriate for this
* particular combination of graphics card and AGP chipset.
*/
/* XXX: Disable fast writes? */
mode = drmAgpGetMode(atic->drmFd); mode = drmAgpGetMode(atic->drmFd);
if (mode > 4) if (atic->is_radeon) {
mode = 4; mode &= ~RADEON_AGP_MODE_MASK;
/* Set all mode bits below the chosen one so fallback can happen */ mode |= RADEON_AGP_1X_MODE;
mode = (mode * 2) - 1; } else {
mode &= ~R128_AGP_MODE_MASK;
mode |= R128_AGP_1X_MODE;
}
if (drmAgpEnable(atic->drmFd, mode) < 0) { if (drmAgpEnable(atic->drmFd, mode) < 0) {
ErrorF("[agp] AGP not enabled\n"); ErrorF("[agp] AGP not enabled\n");
drmAgpRelease(atic->drmFd); drmAgpRelease(atic->drmFd);
return FALSE; return FALSE;
} }
ErrorF("[agp] Mode 0x%08x selected\n", drmAgpGetMode(atic->drmFd));
/* Workaround for some hardware bugs */
if (atic->is_r100) {
cntl = MMIO_IN32(mmio, ATI_REG_AGP_CNTL);
MMIO_OUT32(mmio, ATI_REG_AGP_CNTL, cntl |
RADEON_PENDING_SLOTS_VAL | RADEON_PENDING_SLOTS_SEL);
}
if ((ret = drmAgpAlloc(atic->drmFd, atis->gartSize * 1024 * 1024, 0, if ((ret = drmAgpAlloc(atic->drmFd, atis->gartSize * 1024 * 1024, 0,
NULL, &atis->agpMemHandle)) < 0) { NULL, &atis->agpMemHandle)) < 0) {
@ -317,27 +303,29 @@ ATIDRIAgpInit(ScreenPtr pScreen)
(drmAddressPtr)&atis->gartTex, "AGP texture map")) (drmAddressPtr)&atis->gartTex, "AGP texture map"))
return FALSE; return FALSE;
/* Initialize radeon/r128 AGP registers */ if (atic->is_r100) {
cntl = MMIO_IN32(mmio, ATI_REG_AGP_CNTL); /* Workaround for some hardware bugs */
cntl &= ~ATI_AGP_APER_SIZE_MASK; cntl = MMIO_IN32(mmio, ATI_REG_AGP_CNTL);
switch (atis->gartSize) { MMIO_OUT32(mmio, ATI_REG_AGP_CNTL, cntl |
case 256: cntl |= ATI_AGP_APER_SIZE_256MB; break; RADEON_PENDING_SLOTS_VAL | RADEON_PENDING_SLOTS_SEL);
case 128: cntl |= ATI_AGP_APER_SIZE_128MB; break; } else if (!atic->is_radeon) {
case 64: cntl |= ATI_AGP_APER_SIZE_64MB; break; cntl = MMIO_IN32(mmio, ATI_REG_AGP_CNTL);
case 32: cntl |= ATI_AGP_APER_SIZE_32MB; break; cntl &= ~R128_AGP_APER_SIZE_MASK;
case 16: cntl |= ATI_AGP_APER_SIZE_16MB; break; switch (atis->gartSize) {
case 8: cntl |= ATI_AGP_APER_SIZE_8MB; break; case 256: cntl |= R128_AGP_APER_SIZE_256MB; break;
case 4: cntl |= ATI_AGP_APER_SIZE_4MB; break; case 128: cntl |= R128_AGP_APER_SIZE_128MB; break;
default: case 64: cntl |= R128_AGP_APER_SIZE_64MB; break;
ErrorF("[agp] Illegal aperture size %d kB\n", atis->gartSize * case 32: cntl |= R128_AGP_APER_SIZE_32MB; break;
1024); case 16: cntl |= R128_AGP_APER_SIZE_16MB; break;
case 8: cntl |= R128_AGP_APER_SIZE_8MB; break;
case 4: cntl |= R128_AGP_APER_SIZE_4MB; break;
default:
ErrorF("[agp] Illegal aperture size %d kB\n", atis->gartSize *
1024);
return FALSE; return FALSE;
} }
agpBase = drmAgpBase(atic->drmFd); MMIO_OUT32(mmio, ATI_REG_AGP_CNTL, cntl);
MMIO_OUT32(mmio, ATI_REG_AGP_BASE, agpBase);
MMIO_OUT32(mmio, ATI_REG_AGP_CNTL, cntl);
if (!atic->is_radeon) {
/* Disable Rage 128 PCIGART registers */ /* Disable Rage 128 PCIGART registers */
chunk = MMIO_IN32(mmio, R128_REG_BM_CHUNK_0_VAL); chunk = MMIO_IN32(mmio, R128_REG_BM_CHUNK_0_VAL);
chunk &= ~(R128_BM_PTR_FORCE_TO_PCI | chunk &= ~(R128_BM_PTR_FORCE_TO_PCI |
@ -349,6 +337,8 @@ ATIDRIAgpInit(ScreenPtr pScreen)
MMIO_OUT32(mmio, R128_REG_PCI_GART_PAGE, 1); MMIO_OUT32(mmio, R128_REG_PCI_GART_PAGE, 1);
} }
MMIO_OUT32(mmio, ATI_REG_AGP_BASE, drmAgpBase(atic->drmFd));
return TRUE; return TRUE;
} }

33
hw/kdrive/ati/ati_reg.h
View File

@ -104,16 +104,16 @@
#define ATI_REG_AGP_BASE 0x0170 #define ATI_REG_AGP_BASE 0x0170
#define ATI_REG_AGP_CNTL 0x0174 #define ATI_REG_AGP_CNTL 0x0174
# define ATI_AGP_APER_SIZE_256MB (0x00 << 0) # define R128_AGP_APER_SIZE_256MB (0x00 << 0)
# define ATI_AGP_APER_SIZE_128MB (0x20 << 0) # define R128_AGP_APER_SIZE_128MB (0x20 << 0)
# define ATI_AGP_APER_SIZE_64MB (0x30 << 0) # define R128_AGP_APER_SIZE_64MB (0x30 << 0)
# define ATI_AGP_APER_SIZE_32MB (0x38 << 0) # define R128_AGP_APER_SIZE_32MB (0x38 << 0)
# define ATI_AGP_APER_SIZE_16MB (0x3c << 0) # define R128_AGP_APER_SIZE_16MB (0x3c << 0)
# define ATI_AGP_APER_SIZE_8MB (0x3e << 0) # define R128_AGP_APER_SIZE_8MB (0x3e << 0)
# define ATI_AGP_APER_SIZE_4MB (0x3f << 0) # define R128_AGP_APER_SIZE_4MB (0x3f << 0)
# define ATI_AGP_APER_SIZE_MASK (0x3f << 0) # define R128_AGP_APER_SIZE_MASK (0x3f << 0)
#define RADEON_PENDING_SLOTS_VAL 0x00060000 # define RADEON_PENDING_SLOTS_VAL 0x00060000
#define RADEON_PENDING_SLOTS_SEL 0x00080000 # define RADEON_PENDING_SLOTS_SEL 0x00080000
#define R128_REG_PCI_GART_PAGE 0x017c #define R128_REG_PCI_GART_PAGE 0x017c
@ -294,9 +294,22 @@
# define ATI_CAP_ID_NULL 0x0000 /* End of capability list */ # define ATI_CAP_ID_NULL 0x0000 /* End of capability list */
# define ATI_CAP_ID_AGP 0x0002 /* AGP capability ID */ # define ATI_CAP_ID_AGP 0x0002 /* AGP capability ID */
#define R128_REG_AGP_STATUS 0x0f54 /* PCI */
# define R128_AGP_1X_MODE 0x01
# define R128_AGP_2X_MODE 0x02
# define R128_AGP_4X_MODE 0x04
# define R128_AGP_MODE_MASK 0x07
#define R128_REG_AGP_COMMAND 0x0f58 #define R128_REG_AGP_COMMAND 0x0f58
# define R128_AGP_ENABLE (1 << 8) # define R128_AGP_ENABLE (1 << 8)
#define RADEON_REG_AGP_STATUS 0x0f5c /* PCI */
# define RADEON_AGP_1X_MODE 0x01
# define RADEON_AGP_2X_MODE 0x02
# define RADEON_AGP_4X_MODE 0x04
# define RADEON_AGP_FW_MODE 0x10
# define RADEON_AGP_MODE_MASK 0x17
#define RADEON_REG_AGP_COMMAND 0x0f60 #define RADEON_REG_AGP_COMMAND 0x0f60
# define RADEON_AGP_ENABLE (1 << 8) # define RADEON_AGP_ENABLE (1 << 8)