[Mplayer-cvslog] CVS: main/drivers mga_vid.c,1.35,1.36

[Richard Felker CVS]

Update of /cvsroot/mplayer/main/drivers
In directory mplayer:/var/tmp.root/cvs-serv12231

Modified Files:
	mga_vid.c 
Log Message:
added mga_top_reserved module parameter to skip a configurable amount
of space at the top of video memory. this is needed to prevent
corruption of the kernel's console font when using the "fastfont"
option with matroxfb.


Index: mga_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/mga_vid.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mga_vid.c	4 Feb 2002 16:05:37 -0000	1.35
+++ mga_vid.c	7 Feb 2002 02:07:29 -0000	1.36
@@ -246,9 +246,12 @@
 
 static uint32_t mga_ram_size = 0;	// how much megabytes videoram we have
 
+static uint32_t mga_top_reserved = 0;	// reserved space for console font (matroxfb + fastfont)
+
 //static int mga_force_memsize = 0;
 
 MODULE_PARM(mga_ram_size, "i");
+MODULE_PARM(mga_top_reserved, "i");
 
 static struct pci_dev *pci_dev;
 
@@ -1167,7 +1170,7 @@
 				return(-EFAULT);
 			}
 			
-			mga_src_base = (mga_ram_size*0x100000-mga_config.num_frames*mga_config.frame_size);
+			mga_src_base = (mga_ram_size*0x100000-mga_config.num_frames*mga_config.frame_size-mga_top_reserved);
 			if(mga_src_base<0){
 				printk(KERN_ERR "mga_vid: not enough memory for frames!\n");
 				return(-EFAULT);