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 /src/radeon_driver.c | |
| parent | b853dbb50fb7c46fb5a70f349a3f264f0bb94e8c (diff) | |
Fix building radeon driver with BuildXF86DRI set to NO, the breakage was
caused by the tiling support (bug #2481)
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index c6c07b5..1d78c28 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? */ |