diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-02 15:53:38 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-02 15:56:03 +0100 |
| commit | 9aa665ae33c3ac54b8896e6f8373dfda2637e392 (patch) | |
| tree | 973656aaf39a96514eb500e07f92f6015a69dd28 /src | |
| parent | 21e29e95265331f8a33cd676c2d3124007643135 (diff) | |
sna: Only preserve the real fbcon upon first starting X
We only want to preserve the plymouthd splash screen for flicker free
start up, a subsequent regeneration should be cleared instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 503d1e51..2874c64b 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -257,7 +257,9 @@ static Bool sna_create_screen_resources(ScreenPtr screen) screen->SetScreenPixmap(sna->front); - sna_copy_fbcon(sna); + /* Only preserve the fbcon, not any subsequent server regens */ + if (serverGeneration == 1) + sna_copy_fbcon(sna); if (!sna_become_master(sna)) { xf86DrvMsg(screen->myNum, X_ERROR, |