[Mplayer-cvslog] CVS: main/vidix/drivers mach64_vid.c,1.28,1.29

[Michael Niedermayer]

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

Modified Files:
	mach64_vid.c 
Log Message:
save colorkey stuff patch by (Colin Leroy <colin at colino dot net>)


Index: mach64_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mach64_vid.c	22 Oct 2002 11:52:21 -0000	1.28
+++ mach64_vid.c	22 Oct 2002 13:20:53 -0000	1.29
@@ -119,6 +119,9 @@
   DECLARE_VREG(VIDEO_SYNC_TEST_B)
 };
 
+/* have to restore it on exit */
+static uint32_t SAVED_OVERLAY_GRAPHICS_KEY_CLR;
+
 /* VIDIX exports */
 
 /* MMIO space*/
@@ -465,6 +468,10 @@
   printf("[mach64] Video memory = %uMb\n",mach64_ram_size/0x100000);
   err = mtrr_set_type(pci_info.base0,mach64_ram_size,MTRR_TYPE_WRCOMB);
   if(!err) printf("[mach64] Set write-combining type of video memory\n");
+
+  /* save this */
+  mach64_wait_for_idle();
+  SAVED_OVERLAY_GRAPHICS_KEY_CLR = INREG(OVERLAY_GRAPHICS_KEY_CLR);
   
   /* check if planar formats are supported */
   supports_planar=0;
@@ -501,6 +508,10 @@
 
 void vixDestroy(void)
 {
+  /*restore this*/
+  mach64_wait_for_idle();
+  OUTREG(OVERLAY_GRAPHICS_KEY_CLR,SAVED_OVERLAY_GRAPHICS_KEY_CLR);
+  
   unmap_phys_mem(mach64_mem_base,mach64_ram_size);
   unmap_phys_mem(mach64_mmio_base,0x4000);
 }