summaryrefslogtreecommitdiff
path: root/src/radeon_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r--src/radeon_driver.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c57e13e3..42d18997 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3315,14 +3315,22 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
char* s;
#endif
+
+#ifdef XF86DRI
RADEONTRACE(("RADEONScreenInit %lx %ld %d\n",
pScrn->memPhysBase, pScrn->fbOffset, info->frontOffset));
+#else
+ RADEONTRACE(("RADEONScreenInit %lx %ld\n",
+ pScrn->memPhysBase, pScrn->fbOffset));
+#endif
info->accelOn = FALSE;
#ifdef USE_XAA
info->accel = NULL;
#endif
+#ifdef XF86DRI
pScrn->fbOffset = info->frontOffset;
+#endif
if (!RADEONMapMem(pScrn)) return FALSE;
#ifdef XF86DRI
@@ -3497,6 +3505,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
/* Setup DRI after visuals have been established, but before fbScreenInit is
* called. fbScreenInit will eventually call the driver's InitGLXVisuals
* call back. */
+#ifdef XF86DRI
if (info->directRenderingEnabled) {
/* FIXME: When we move to dynamic allocation of back and depth
* buffers, we will want to revisit the following check for 3
@@ -3520,7 +3529,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
}
}
-#if defined(XF86DRI)
/* Tell DRI about new memory map */
if (info->directRenderingEnabled && info->newMemoryMap) {
if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_NEW_MEMMAP, 1) < 0) {