summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-09-26 18:10:44 -0700
committerKeith Packard <keithp@keithp.com>2014-11-20 17:23:29 -0800
commitb29e825b6e95a874ffa343db584eccf493a10159 (patch)
tree1f160059b95f4bcab3920f7301028c5c700959ee
parent85f3b97618add11a5320c615655f7cfb0e5e3283 (diff)
Delay mode set until fb contents copied from consoleglamor
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@keithp.com>
-rw-r--r--src/uxa/intel_driver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 15d2d786..79226932 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -167,7 +167,8 @@ static Bool i830CreateScreenResources(ScreenPtr screen)
return FALSE;
intel_copy_fb(scrn);
- return TRUE;
+
+ return I830EnterVT(VT_FUNC_ARGS(0));
}
void
@@ -1004,7 +1005,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)