[Mplayer-cvslog] CVS: main/drivers/radeon Makefile,1.7,1.8 radeon_vid.c,1.20,1.21

[Nick Kurshev]

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

Modified Files:
	Makefile radeon_vid.c 
Log Message:
Fixed single buffering problems and -vo mga compatibility by number of buffers

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	1 Dec 2001 20:23:47 -0000	1.7
+++ Makefile	2 Dec 2001 12:21:06 -0000	1.8
@@ -45,4 +45,4 @@
 vid:
 	make install
 	rmmod radeon_vid
-	modprobe radeon_vid
+	modprobe radeon_vid mtrr=1

Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- radeon_vid.c	2 Dec 2001 11:45:44 -0000	1.20
+++ radeon_vid.c	2 Dec 2001 12:21:06 -0000	1.21
@@ -14,7 +14,7 @@
  * Also here was used code from CVS of GATOS project and X11 trees.
  */
 
-#define RADEON_VID_VERSION "1.0.1"
+#define RADEON_VID_VERSION "1.0.2"
 
 /*
   It's entirely possible this major conflicts with something else
@@ -311,6 +311,10 @@
     OUTREG(OV0_AUTO_FLIP_CNTL,OV0_AUTO_FLIP_CNTL_SOFT_BUF_ODD);
 
     OUTREG(OV0_DEINTERLACE_PATTERN,besr.deinterlace_pattern);
+
+    OUTREG(OV0_COLOUR_CNTL, (besr.brightness & 0x7f) |
+			    (besr.saturation << 8) |
+			    (besr.saturation << 16));
    
     OUTREG(OV0_AUTO_FLIP_CNTL,(INREG(OV0_AUTO_FLIP_CNTL)^OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE));
     OUTREG(OV0_AUTO_FLIP_CNTL,(INREG(OV0_AUTO_FLIP_CNTL)^OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE));
@@ -615,11 +619,13 @@
 				return -EFAULT;
 			}
 
-			if(radeon_config.num_frames<1 || radeon_config.num_frames>4){
+			if(radeon_config.num_frames<1){
 				printk(RVID_MSG"illegal num_frames: %d\n",radeon_config.num_frames);
 				return -EFAULT;
 			}
-
+			if(radeon_config.num_frames==1) besr.double_buff=0;
+			if(!besr.double_buff) radeon_config.num_frames=1;
+			else                  radeon_config.num_frames=2;
 			radeon_config.card_type = 0;
 			radeon_config.ram_size = radeon_ram_size;
 			radeon_overlay_off = radeon_ram_size*0x100000 - radeon_config.frame_size*radeon_config.num_frames;