summaryrefslogtreecommitdiff
path: root/src/intel_driver.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-06-12 10:26:34 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-12 15:09:05 +0100
commit3b9b64c7c9b5b0bfaafb97c9a9fe5849bbb412da (patch)
tree30249dd20eeefba76f7e42b4ab1d3933c1877621 /src/intel_driver.c
parentb6525702b9ffd21beb8ea6bb10a8ad5ce7f9de14 (diff)
uxa: do copy fb at startup.
Copy the current framebuffer for smooth wayland->gdm handoff. This has been hanging around in Fedora for too long now, and we've dropped the feature a few times, and yes I know the Simpsons did it^W^W^W SNA does it. I've updated the code to have some of the better fixes from nouveau. I've no idea who wrote this code either, krh or ajax. [ickle: The earliest version I've found had krh's fingerprints on it, though it may still have been a joint effort.] Signed-off-by: Dave Airlie <airlied@redhat.com> [ickle: improve error handling, only copy the fb during initial takeover]
Diffstat (limited to 'src/intel_driver.c')
-rw-r--r--src/intel_driver.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 67cec488..8962a112 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -167,7 +167,11 @@ static Bool i830CreateScreenResources(ScreenPtr screen)
if (!(*screen->CreateScreenResources) (screen))
return FALSE;
- return intel_uxa_create_screen_resources(screen);
+ if (!intel_uxa_create_screen_resources(screen))
+ return FALSE;
+
+ intel_copy_fb(scrn);
+ return TRUE;
}
static void PreInitCleanup(ScrnInfoPtr scrn)