summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.(none)>2006-11-22 13:44:49 -0500
committerAlex Deucher <alex@t41p.(none)>2006-11-22 13:44:49 -0500
commit0d42cab2d889070ab6de05990e2b19724595f7af (patch)
treefeb3278175de3ffffc84062a980c8096456ecea8
parent8e0f57571228729cc40ed59266484ecc43819f44 (diff)
clean up previous VIP commit.
-rw-r--r--src/radeon_video.c6
-rw-r--r--src/radeon_vip.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 21d0c305..b9b479f0 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 3e14f3b6..abcba06a 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);
}