[PATCH 4/4] Delay mode set until fb contents copied from console

[Keith Packard]

Instead of doing the initial mode set in I830ScreenInit, move it to
i830CreateScreenResources after the call to intel_copy_fb so that the
new frame buffer we set up has the contents of the existing console,
eliminating a flash of black between the mode set and the copy.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 src/uxa/intel_driver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 619ac50..052e95c 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -187,7 +187,8 @@ static Bool i830CreateScreenResources(ScreenPtr screen)
         }
 
 	intel_copy_fb(scrn);
-	return TRUE;
+
+	return I830EnterVT(VT_FUNC_ARGS(0));
 }
 
 void
@@ -1249,7 +1250,7 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
 	 * later memory should be bound when allocating, e.g rotate_mem */
 	scrn->vtSema = TRUE;
 
-	return I830EnterVT(VT_FUNC_ARGS(0));
+        return TRUE;
 }
 
 static void i830AdjustFrame(ADJUST_FRAME_ARGS_DECL)
-- 
2.1.1