diff options
| author | Roland Scheidegger <rscheidegger_lists@hispeed.ch> | 2005-02-22 00:39:15 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger_lists@hispeed.ch> | 2005-02-22 00:39:15 +0000 |
| commit | f1edbb7852d85f660188498f578a0a697c2094fe (patch) | |
| tree | b63fa4891c7e69064a02851c98e69ddbf9e4dcb8 | |
| parent | b853dbb50fb7c46fb5a70f349a3f264f0bb94e8c (diff) | |
Fix building radeon driver with BuildXF86DRI set to NO, the breakage was
caused by the tiling support (bug #2481)
| -rw-r--r-- | src/radeon.h | 5 | ||||
| -rw-r--r-- | src/radeon_dri.h | 3 | ||||
| -rw-r--r-- | src/radeon_driver.c | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/radeon.h b/src/radeon.h index 20fad258..b6fd8ce3 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -94,6 +94,8 @@ typedef enum { #define RADEON_TIMEOUT 2000000 /* Fall out of wait loops after this count */ #define RADEON_MMIOSIZE 0x80000 +/* Buffer are aligned on 4096 byte boundaries */ +#define RADEON_BUFFER_ALIGN 0x00000fff #define RADEON_VBIOS_SIZE 0x00010000 #define RADEON_USE_RMX 0x80000000 /* mode flag for using RMX * Need to comfirm this is not used @@ -428,6 +430,7 @@ typedef struct { DGAFunctionRec DGAFuncs; RADEONFBLayout CurrentLayout; + CARD32 dst_pitch_offset; #ifdef XF86DRI Bool noBackBuffer; Bool directRenderingEnabled; @@ -524,8 +527,6 @@ typedef struct { CARD32 backPitchOffset; CARD32 depthPitchOffset; - CARD32 dst_pitch_offset; - /* offscreen memory management */ int backLines; FBAreaPtr backArea; diff --git a/src/radeon_dri.h b/src/radeon_dri.h index 9316d75e..9a90ec84 100644 --- a/src/radeon_dri.h +++ b/src/radeon_dri.h @@ -58,9 +58,6 @@ #define RADEON_CARD_TYPE_RADEON 1 -/* Buffer are aligned on 4096 byte boundaries */ -#define RADEON_BUFFER_ALIGN 0x00000fff - #define RADEONCP_USE_RING_BUFFER(m) \ (((m) == RADEON_CSQ_PRIBM_INDDIS) || \ ((m) == RADEON_CSQ_PRIBM_INDBM)) diff --git a/src/radeon_driver.c b/src/radeon_driver.c index c6c07b54..1d78c289 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -4998,7 +4998,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) info->directRenderingEnabled = RADEONDRIScreenInit(pScreen); } } -#endif /* Depth moves are disabled by default since they are extremely slow */ info->depthMoves = xf86ReturnOptValBool(info->Options, @@ -5013,6 +5012,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Depth moves disabled by default\n"); } +#endif RADEONSetFBLocation(pScrn); @@ -7872,7 +7872,10 @@ void RADEONDoAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int clone) } crtcoffsetcntl = INREG(regcntl) & ~0xf; /* try to get rid of flickering when scrolling at least for 2d */ - if (!info->have3DWindows) crtcoffsetcntl &= ~RADEON_CRTC_OFFSET_FLIP_CNTL; +#ifdef XF86DRI + if (!info->have3DWindows) +#endif + crtcoffsetcntl &= ~RADEON_CRTC_OFFSET_FLIP_CNTL; if (info->tilingEnabled) { int byteshift = info->CurrentLayout.bitsPerPixel >> 4; /* crtc uses 256(bytes)x8 "half-tile" start addresses? */ |