summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/i810_driver.c2
-rw-r--r--src/i830_driver.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/i810_driver.c b/src/i810_driver.c
index a08a500f..7961c3d8 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -2024,7 +2024,9 @@ I810ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
#endif
+#ifdef XFreeXDGA
I810DGAInit(pScreen);
+#endif
if (!xf86InitFBManager(pScreen, &(pI810->FbMemBox))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7e0ebf3f..4334de62 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2733,7 +2733,10 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetBlackWhitePixels(pScreen);
- xf86DiDGAInit (pScreen, pI830->LinearAddr + pScrn->fbOffset);
+#ifdef XFreeXDGA
+ if (!pI830->use_drm_mode)
+ xf86DiDGAInit (pScreen, pI830->LinearAddr + pScrn->fbOffset);
+#endif
if (!I830AccelInit(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,