xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_video.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit eb5665688ef9b52f03f61546351d0848cab54740
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Apr 8 00:31:52 2010 -0400

    radeon: don't setup Xv on rn50
    
    It has no overlay or 3D engine.
    
    fixes fdo bug 27528

diff --git a/src/radeon_video.c b/src/radeon_video.c
index 8f0917f..5e2a723 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -271,10 +271,14 @@ void RADEONInitVideo(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     RADEONInfoPtr    info = RADEONPTR(pScrn);
+    RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
     XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
     XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
     int num_adaptors;
 
+    /* no overlay or 3D on RN50 */
+    if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2)
+	    return;
 
     num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
     newAdaptors = xalloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *));