summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authornick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-25 08:12:58 +0000
committernick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-25 08:12:58 +0000
commit6f1840ae23f9f4c97e3df21ed0ea298a6fb80ad2 (patch)
tree681c96f54b9a66810d1809d1aaddaa51e8e9f774 /vidix
parentba4694f4bb6e456868a22d927d8f34f93625a2af (diff)
downloadmpv-6f1840ae23f9f4c97e3df21ed0ea298a6fb80ad2.tar.bz2
mpv-6f1840ae23f9f4c97e3df21ed0ea298a6fb80ad2.tar.xz
Minor fixes and probably final fix of vsync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4856 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/drivers/radeon_vid.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c
index a248147e9f..fa24836572 100644
--- a/vidix/drivers/radeon_vid.c
+++ b/vidix/drivers/radeon_vid.c
@@ -848,7 +848,7 @@ int vixInit( void )
void vixDestroy( void )
{
unmap_phys_mem(radeon_mem_base,radeon_ram_size);
- unmap_phys_mem(radeon_mmio_base,0x7FFF);
+ unmap_phys_mem(radeon_mmio_base,0xFFFF);
}
int vixGetCapability(vidix_capability_t *to)
@@ -1306,19 +1306,18 @@ int vixPlaybackFrameSelect(unsigned frame)
off[4] = besr.vid_buf4_base_adrs;
off[5] = besr.vid_buf5_base_adrs;
}
- radeon_wait_vsync();
- radeon_fifo_wait(2);
+ radeon_fifo_wait(8);
OUTREG(OV0_REG_LOAD_CNTL, REG_LD_CTL_LOCK);
radeon_engine_idle();
while(!(INREG(OV0_REG_LOAD_CNTL)&REG_LD_CTL_LOCK_READBACK));
OUTREG(OV0_VID_BUF0_BASE_ADRS, off[0]);
OUTREG(OV0_VID_BUF1_BASE_ADRS, off[1]);
OUTREG(OV0_VID_BUF2_BASE_ADRS, off[2]);
- radeon_fifo_wait(9);
OUTREG(OV0_VID_BUF3_BASE_ADRS, off[3]);
OUTREG(OV0_VID_BUF4_BASE_ADRS, off[4]);
OUTREG(OV0_VID_BUF5_BASE_ADRS, off[5]);
OUTREG(OV0_REG_LOAD_CNTL, 0);
+ radeon_wait_vsync();
if(__verbose > 1) radeon_vid_dump_regs();
return 0;
}