xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_video.c |    7 +++++++
 src/radeon_vip.c   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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

    Don't mess with the VIP bus on mobility chips.  Seems to cause fan
    problems on asus laptops (see bug 7463).  We don't support video-in
    on any laptops at the moment anyway.

diff --git a/src/radeon_video.c b/src/radeon_video.c
index d4e1f0a..21d0c30 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -1396,6 +1396,13 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
 
     /* 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
+     */
+    if (!info->IsMobility)
+	RADEONVIP_reset(pScrn, pPriv);
+
     info->adaptor = adapt;
 
 	if(!xf86LoadSubModule(pScrn,"theatre_detect")) 
diff --git a/src/radeon_vip.c b/src/radeon_vip.c
index abcba06..3e14f3b 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);*/
 }