summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-29 14:45:44 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-29 14:45:44 +0000
commitc443bde56a295c32c59017310c7a4aaa71581476 (patch)
treeb15f8b6a0d1df09e0968bddfd55acee16edf3097 /vidix
parent54abc1a05e8a022d4738f5a1e8f68f574be49ced (diff)
downloadmpv-c443bde56a295c32c59017310c7a4aaa71581476.tar.bz2
mpv-c443bde56a295c32c59017310c7a4aaa71581476.tar.xz
Add VIDEOMEMORY_SIZE define to allow to easily change it.
Needed for xvidix sine X seems to ignore VideoRAM settings < 8MB, causing a mess when MPlayer and X use the same memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20516 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/drivers/unichrome_vid.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/vidix/drivers/unichrome_vid.c b/vidix/drivers/unichrome_vid.c
index 549db826a8..851915ede5 100644
--- a/vidix/drivers/unichrome_vid.c
+++ b/vidix/drivers/unichrome_vid.c
@@ -78,8 +78,9 @@ uint8_t hwrev;
#define UC_MAP_V1_FIFO_CONTROL(depth, pre_thr, thr) \
(((depth)-1) | ((thr) << 8) | ((pre_thr) << 24))
-#define FRAMEBUFFER_START 0x600000
+#define VIDEOMEMORY_SIZE (8 * 1024 * 1024)
#define FRAMEBUFFER_SIZE 0x200000
+#define FRAMEBUFFER_START (VIDEOMEMORY_SIZE - FRAMEBUFFER_SIZE)
#ifdef DEBUG_LOGFILE
FILE *logfile = 0;
@@ -529,7 +530,7 @@ int
vixInit (void)
{
long tmp;
- uc_mem = map_phys_mem (pci_info.base0, 0x800000);
+ uc_mem = map_phys_mem (pci_info.base0, VIDEOMEMORY_SIZE);
enable_app_io ();
outb (0x2f, 0x3c4);
@@ -590,7 +591,7 @@ vixDestroy (void)
outb (mclk_save[2], 0x3c5);
disable_app_io ();
- unmap_phys_mem (uc_mem, 0x800000);
+ unmap_phys_mem (uc_mem, VIDEOMEMORY_SIZE);
unmap_phys_mem (vio, 0x1000);
}