xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 579070ed9f0218a975e840331b6fe9fa8fd05789
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sat Sep 19 19:15:14 2009 -0400

    kms: disable dga
    
    Can be dangerous with kms:
    http://lists.freedesktop.org/archives/xorg-devel/2009-September/002113.html

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index a0ed165..e2f716e 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -701,7 +701,10 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen,
 
     /* DGA setup */
 #ifdef XFreeXDGA
-    xf86DiDGAInit(pScreen, info->LinearAddr + pScrn->fbOffset);
+    /* DGA is dangerous on kms as the base and framebuffer location may change:
+     * http://lists.freedesktop.org/archives/xorg-devel/2009-September/002113.html
+     */
+    /* xf86DiDGAInit(pScreen, info->LinearAddr + pScrn->fbOffset); */
 #endif
 
     /* Init Xv */