summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-09-18 21:05:23 -0700
committerKeith Packard <keithp@keithp.com>2009-09-21 17:24:11 -0700
commit5e80297d088e8cdbf66d765f7d252dab66c8df86 (patch)
tree16af73d770732424fdc492f707d6b2681ec3db15
parent4758311842a16600287c8f9f77ce0af1a31b9264 (diff)
Remove DGA support from the driver.
The xf86DiDGA code required that the scanout buffer always be mappable, stay be at a fixed address in the aperture and have a constant size. With frame buffer resizing, the latter two are no longer true, and with KMS, we'd really prefer to not allow the former. The only option available to the driver is to completely disable DGA as the modes code has internal calls to the xf86DiDGA code when fetching new modes from the hardware. A fix for the DiDGA code will be added to the X server which will automatically initialize DGA for mode switching and input, but not frame buffer access, and not require any driver cooperation. Thus, the correct solution is for the driver to not call xf86DiDGAInit at all. For old servers, this eliminates a potential catastrophic problem where random memory is written by the X server. New servers will get the DIX-based behaviour automatically. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/i830_driver.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4eb02551..316a1fa1 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2708,11 +2708,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetBlackWhitePixels(pScreen);
-#ifdef XFreeXDGA
- if (!pI830->use_drm_mode)
- xf86DiDGAInit (pScreen, pI830->LinearAddr + pScrn->fbOffset);
-#endif
-
if (!I830AccelInit(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Hardware acceleration initialization failed\n");