xserver/hw/kdrive/src kdrive.c,1.41,1.42

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory gabe:/tmp/cvs-serv4029/hw/kdrive/src

Modified Files:
	kdrive.c 
Log Message:
2005-02-28  Keith Packard  <[email protected]>

	* hw/kdrive/src/kdrive.c: (KdEnableScreen):
	Force DPMS normal on screen enable
	* include/windowstr.h:
	Add placeholder for bit used to redirect input

2005-02-28  Keith Packard  <[email protected]>

	* ati_reg.h:
	Add macrovision register defines



Index: kdrive.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kdrive.c	20 Jan 2005 20:51:27 -0000	1.41
+++ kdrive.c	28 Feb 2005 20:45:15 -0000	1.42
@@ -302,6 +302,7 @@
 	if (!(*pScreenPriv->card->cfuncs->enable) (pScreen))
 	    return FALSE;
     pScreenPriv->enabled = TRUE;
+    pScreenPriv->dpmsState = KD_DPMS_NORMAL;
     pScreenPriv->card->selected = pScreenPriv->screen->mynum;
     KdOffscreenSwapIn (pScreen);    
     if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->enableCursor)