[Intel-gfx] [PATCH] Make DGA optional

[Zhenyu Wang]

As DGA is optional in xserver, we should check this too instead
of always trying to init DGA.

Found when update xserver to 6fffcd5825454a7fe58ffbcfb219f007cf38e731,
but not update xf86dgaproto, which caused X fails to start.

Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>
---
 src/i810_driver.c |    2 ++
 src/i830_driver.c |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/i810_driver.c b/src/i810_driver.c
index a08a500..7961c3d 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 7e0ebf3..4334de6 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,
-- 
1.5.3.8