diff options
| author | Dave Airlie <airlied@nx6125b.(none)> | 2007-05-30 17:27:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@nx6125b.(none)> | 2007-05-30 17:27:22 +1000 |
| commit | 7fc02657c4d740941fbda5a8823cf45de3eca3f8 (patch) | |
| tree | 37cab7df21004c50dd3c6777700ecd0f9c596077 /src/radeon.h | |
| parent | 800bf53279e2c2bf854682bbfd6fa16d03afed00 (diff) | |
| parent | 4c61c0ee91a2ffeefce30972a584486f1df1d1ae (diff) | |
Merge branch 'origin' into randr-1.2-test
Conflicts:
src/radeon_cursor.c
src/radeon_display.c
src/radeon_driver.c
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/radeon.h b/src/radeon.h index d75b1547..eb4902bb 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -153,7 +153,6 @@ typedef enum { } RADEONOpts; -#define RADEON_DEBUG 1 /* Turn off debugging output */ #define RADEON_IDLE_RETRY 16 /* Fall out of idle loops after this count */ #define RADEON_TIMEOUT 2000000 /* Fall out of wait loops after this count */ @@ -165,15 +164,7 @@ typedef enum { * for something else. */ -#if RADEON_DEBUG -#define RADEONTRACE(x) \ -do { \ - ErrorF("(**) %s(%d): ", RADEON_NAME, pScrn->scrnIndex); \ - ErrorF x; \ -} while(0) -#else -#define RADEONTRACE(x) do { } while(0) -#endif +#define RADEON_LOGLEVEL_DEBUG 4 /* for Xv, outputs */ #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) @@ -299,6 +290,10 @@ typedef struct { CARD32 tv_dac_cntl; + CARD32 rs480_unk_e30; + CARD32 rs480_unk_e34; + CARD32 rs480_unk_e38; + CARD32 rs480_unk_e3c; } RADEONSaveRec, *RADEONSavePtr; typedef struct { @@ -782,6 +777,7 @@ extern Bool RADEONAccelInit(ScreenPtr pScreen); extern Bool RADEONSetupMemEXA (ScreenPtr pScreen); extern Bool RADEONDrawInitMMIO(ScreenPtr pScreen); #ifdef XF86DRI +extern unsigned long long RADEONTexOffsetStart(PixmapPtr pPix); extern Bool RADEONGetDatatypeBpp(int bpp, CARD32 *type); extern Bool RADEONGetPixmapOffsetPitch(PixmapPtr pPix, CARD32 *pitch_offset); |