diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-19 15:51:43 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-19 16:12:37 +0000 |
| commit | 1c2932e9cb283942567c3dd2695d03b8045da27f (patch) | |
| tree | 744d100db48766fd90792de712a8fd40d1dee1de | |
| parent | 972e1108a5606399a679f97af0815ec9730ab5be (diff) | |
uxa: Defer the call to EnterVT till after outputs are initialised
We need to do this apparently or else we never perform the VT switch.
However, we can not do it too early, especially not before we have
finished intialising the outputs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47395
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_driver.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index e4dd26b3..4265de82 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -1011,13 +1011,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) "Hardware cursor initialization failed\n"); } - /* Must force it before EnterVT, so we are in control of VT and - * later memory should be bound when allocating, e.g rotate_mem */ - scrn->vtSema = TRUE; - - if (!I830EnterVT(scrnIndex, 0)) - return FALSE; - intel->BlockHandler = screen->BlockHandler; screen->BlockHandler = I830BlockHandler; @@ -1090,7 +1083,11 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) I830UeventInit(scrn); #endif - return TRUE; + /* Must force it before EnterVT, so we are in control of VT and + * later memory should be bound when allocating, e.g rotate_mem */ + scrn->vtSema = TRUE; + + return I830EnterVT(scrnIndex, 0); } static void i830AdjustFrame(int scrnIndex, int x, int y, int flags) |