xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_video.c |    6 ++----
 src/radeon_vip.c   |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
diff-tree 0d42cab2d889070ab6de05990e2b19724595f7af (from 8e0f57571228729cc40ed59266484ecc43819f44)
Author: Alex Deucher <alex at t41p.(none)>
Date:   Wed Nov 22 13:44:49 2006 -0500

    clean up previous VIP commit.

diff --git a/src/radeon_video.c b/src/radeon_video.c
index 21d0c30..b9b479f 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -1394,14 +1394,12 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
                 xf86DrvMsg(pScrn->scrnIndex, X_INFO, "     found device at address 0x%02x\n", i);
     #endif
 
-    /* Initialize VIP bus */
-    RADEONVIP_init(pScrn, pPriv);
-
     /* resetting the VIP bus causes problems with some mobility chips.
      * we don't support video in on any mobility chips at the moment anyway
      */
+    /* Initialize VIP bus */
     if (!info->IsMobility)
-	RADEONVIP_reset(pScrn, pPriv);
+	RADEONVIP_init(pScrn, pPriv);
 
     info->adaptor = adapt;
 
diff --git a/src/radeon_vip.c b/src/radeon_vip.c
index 3e14f3b..abcba06 100644
--- a/src/radeon_vip.c
+++ b/src/radeon_vip.c
@@ -351,5 +351,5 @@ void RADEONVIP_init(ScrnInfoPtr pScrn, R
     pPriv->VIP->fifo_read=RADEONVIP_fifo_read;
     pPriv->VIP->fifo_write=RADEONVIP_fifo_write;
    
-    /*RADEONVIP_reset(pScrn, pPriv);*/
+    RADEONVIP_reset(pScrn, pPriv);
 }