summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/radeon_video.c7
-rw-r--r--src/radeon_vip.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index d4e1f0ac..21d0c305 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 abcba06a..3e14f3b6 100644
--- a/src/radeon_vip.c
+++ b/src/radeon_vip.c
@@ -351,5 +351,5 @@ void RADEONVIP_init(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
pPriv->VIP->fifo_read=RADEONVIP_fifo_read;
pPriv->VIP->fifo_write=RADEONVIP_fifo_write;
- RADEONVIP_reset(pScrn, pPriv);
+ /*RADEONVIP_reset(pScrn, pPriv);*/
}