xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_video.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d2f712eaf1e569fd92bbe2db5aceb43b7b367d1
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Jul 3 10:40:59 2009 +1000

    radeon: don't set up overlay under KMS until we figure out how.

diff --git a/src/radeon_video.c b/src/radeon_video.c
index a14f44c..58b9d46 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
     memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
     adaptors = newAdaptors;
 
-    if (!IS_AVIVO_VARIANT) {
+    if (!IS_AVIVO_VARIANT && !info->kms_enabled) {
 	overlayAdaptor = RADEONSetupImageVideo(pScreen);
 	if (overlayAdaptor != NULL) {
 	    adaptors[num_adaptors++] = overlayAdaptor;