[Mplayer-cvslog] CVS: main/drivers/radeon radeonfb.c,1.12,1.13

[Nick Kurshev]

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

Modified Files:
	radeonfb.c 
Log Message:
Imported some XFree86-CVS stuff

Index: radeonfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeonfb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- radeonfb.c	2 Oct 2001 16:04:45 -0000	1.12
+++ radeonfb.c	8 Oct 2001 08:22:32 -0000	1.13
@@ -88,7 +88,7 @@
 #if DEBUG
 #define RTRACE		printk
 #else
-#define RTRACE		if(0) printk
+#define RTRACE(...)	((void)0)
 #endif
 
 
@@ -158,21 +158,6 @@
 } reg_val;
 
[...1826 lines suppressed...]
+}
+
+static void radeon_write_state (struct radeonfb_info *rinfo,
+                               struct radeon_regs *restore)
+{
+RTRACE("radeonfb: radeon_write_state is called\n"); 
+	radeonfb_blank(VESA_POWERDOWN,&rinfo->info);
+	OUTREG(AMCGPIO_MASK,	restore->amcgpio_mask);
+	OUTREG(AMCGPIO_EN_REG,	restore->amcgpio_en_reg);
+	OUTREG(CLOCK_CNTL_INDEX,restore->clock_cntl_index);
+	OUTREG(RBBM_SOFT_RESET,	restore->rbbm_soft_reset);
+	OUTREG(DP_DATATYPE,	restore->dp_datatype);
+	/* M6 card has trouble restoring text mode for its CRT.
+	Needs this workaround.*/
+	if(rinfo->isM6) OUTREG(DAC_CNTL2, restore->dac2_cntl);
+	radeon_write_mode(rinfo,restore);
+	radeonfb_blank(VESA_NO_BLANKING,&rinfo->info);
 }
 
 #if 0