diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-16 03:09:34 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-16 03:09:34 +0000 |
| commit | 4d6656062129da0489eb4bc898871379ba891d8f (patch) | |
| tree | 8aca9273a5eb9b75b64e880b605aaef8dcb08a03 /src/radeon_reg.h | |
| parent | 36799e3ea7ddde5fce528e8bc17ea942933a9111 (diff) | |
Add various workarounds that seem to fix some remaning lockup scenarios I'm
experiencing with the driver when setting the memory map. Some of the
magic delays are a bit dodgy but they seem to work, I suppose I can't
do better now without help from ATI. Also removed some really too noisy
debug messages.
Diffstat (limited to 'src/radeon_reg.h')
| -rw-r--r-- | src/radeon_reg.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/radeon_reg.h b/src/radeon_reg.h index c5dca461..71b10c02 100644 --- a/src/radeon_reg.h +++ b/src/radeon_reg.h @@ -307,9 +307,9 @@ # define RADEON_CRTC_DBL_SCAN_EN (1 << 0) # define RADEON_CRTC_INTERLACE_EN (1 << 1) # define RADEON_CRTC_CSYNC_EN (1 << 4) +# define RADEON_CRTC_ICON_EN (1 << 15) # define RADEON_CRTC_CUR_EN (1 << 16) # define RADEON_CRTC_CUR_MODE_MASK (7 << 17) -# define RADEON_CRTC_ICON_EN (1 << 20) # define RADEON_CRTC_EXT_DISP_EN (1 << 24) # define RADEON_CRTC_EN (1 << 25) # define RADEON_CRTC_DISP_REQ_EN_B (1 << 26) @@ -849,6 +849,9 @@ #define RADEON_MAX_LATENCY 0x0f3f /* PCI */ #define RADEON_MC_AGP_LOCATION 0x014c #define RADEON_MC_FB_LOCATION 0x0148 +#define RADEON_MC_STATUS 0x0150 +# define RADEON_MC_IDLE (1 << 2) +# define R300_MC_IDLE (1 << 4) #define RADEON_DISPLAY_BASE_ADDR 0x23c #define RADEON_DISPLAY2_BASE_ADDR 0x33c #define RADEON_OV0_BASE_ADDR 0x43c |