diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-09-02 22:57:33 +0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-09-02 07:14:57 -0700 |
| commit | fe7693c94a396b9d17bb66a000178750a432ce3a (patch) | |
| tree | c27a43278cf37045518ae49b015aed33a0831010 | |
| parent | 5812531e08147576de776b2dd64e7f94c08eb851 (diff) | |
Make DGA optional
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@linux.intel.com>
| -rw-r--r-- | src/i810_driver.c | 2 | ||||
| -rw-r--r-- | 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 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, |