From a2bd75d15a99d4ee117e17921f0426228d53f5e8 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 29 May 2001 21:55:41 +0000
Subject: [PATCH] Xfbdev: Make sure screen gets re-enabled on RandR failure

---
 hw/kdrive/fbdev/fbdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index c5e93c085..28824b841 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.14 2001/05/29 04:54:11 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.15 2001/05/29 17:47:55 keithp Exp $ */
 
 #include "fbdev.h"
 
@@ -531,6 +531,8 @@ fbdevRandRSetConfig (ScreenPtr	    pScreen,
 	    LayerDestroy (pScreen, pNewLayer);
 	    scrpriv->rotation = oldrotation;
 	    scrpriv->shadow = oldshadow;
+	    if (wasEnabled)
+		KdEnableScreen (pScreen);
 	    return FALSE;
 	}
         WalkTree (pScreen, fbdevLayerRemove, (pointer) scrpriv->pLayer);