[Xserver-commit] xserver/hw/kdrive/src kdrive.h,1.39,1.40 koffscreen.c,1.7,1.8

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/tmp/cvs-serv12321/hw/kdrive/src

Modified Files:
	kdrive.h koffscreen.c 
Log Message:
	* hw/kdrive/src/kdoffscreen.c: (KdOffscreenSwapOut/KdOffscreenSwapIn)
	Discard/reconstruct list of offscreen areas on VT switch so no
	allocations can occur while switched away.
	* hw/kdrive/src/kdrive.h: (KdScreenInfo)
	Set type of off_screen_areas member to actual type instead of pointer


Index: kdrive.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- kdrive.h	15 Oct 2003 05:34:54 -0000	1.39
+++ kdrive.h	16 Oct 2003 08:03:25 -0000	1.40
@@ -121,7 +121,7 @@
     CARD8	*memory_base;
     int         off_screen_base;
     int         off_screen_size;
-    pointer     off_screen_areas;
+    struct _RealOffscreenArea	*off_screen_areas;
 } KdScreenInfo;
 
 typedef struct _KdCardFuncs {

Index: koffscreen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/koffscreen.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- koffscreen.c	14 Oct 2003 21:10:53 -0000	1.7
+++ koffscreen.c	16 Oct 2003 08:03:25 -0000	1.8
@@ -222,12 +222,13 @@
 	KdOffscreenValidate (pScreen);
     }    
     KdOffscreenValidate (pScreen);
+    KdOffscreenFini (pScreen);
 }
 
 void
 KdOffscreenSwapIn (ScreenPtr pScreen)
 {
-    /* nothing to do here; page in on usage */
+    KdOffscreenInit (pScreen);
 }
 
 /* merge the next free area into this one */
@@ -248,7 +249,6 @@
 void
 KdOffscreenFree (KdOffscreenArea *area)
 {
-    ScreenPtr		pScreen = area->screen;
     RealOffscreenArea	*real_area = (RealOffscreenArea *) area;
     RealOffscreenArea	*next = real_area->next;
     RealOffscreenArea	*prev = real_area->prev;