From 6d289390ec4d643e7451f9dcb35439876f361c44 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 8 Jun 2012 18:10:18 +0200 Subject: [PATCH] st/xorg: Fix crash on startup. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Dave Airlie Tested-by: Michel Dänzer --- src/gallium/state_trackers/xorg/xorg_driver.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c index 4b128221b75..1b0b4c6b7a0 100644 --- a/src/gallium/state_trackers/xorg/xorg_driver.c +++ b/src/gallium/state_trackers/xorg/xorg_driver.c @@ -71,6 +71,7 @@ static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL); static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL); static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL); static Bool drv_enter_vt(VT_FUNC_ARGS_DECL); +static Bool drv_enter_vt_flags(ScrnInfoPtr pScrn, int flags); static void drv_leave_vt(VT_FUNC_ARGS_DECL); static void drv_free_screen(FREE_SCREEN_ARGS_DECL); static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, @@ -887,7 +888,7 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) if (serverGeneration == 1) xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); - return drv_enter_vt(VT_FUNC_ARGS); + return drv_enter_vt_flags(pScrn, 1); } static void @@ -959,9 +960,8 @@ drv_leave_vt(VT_FUNC_ARGS_DECL) * This gets called when gaining control of the VT, and from ScreenInit(). */ static Bool -drv_enter_vt(VT_FUNC_ARGS_DECL) +drv_enter_vt_flags(ScrnInfoPtr pScrn, int flags) { - SCRN_INFO_PTR(arg); modesettingPtr ms = modesettingPTR(pScrn); CustomizerPtr cust = ms->cust; @@ -971,7 +971,7 @@ drv_enter_vt(VT_FUNC_ARGS_DECL) if (!ms->create_front_buffer(pScrn)) return FALSE; - if (!ms->bind_front_buffer(pScrn)) + if (!flags && !ms->bind_front_buffer(pScrn)) return FALSE; if (!xf86SetDesiredModes(pScrn)) @@ -983,6 +983,13 @@ drv_enter_vt(VT_FUNC_ARGS_DECL) return TRUE; } +static Bool +drv_enter_vt(VT_FUNC_ARGS_DECL) +{ + SCRN_INFO_PTR(arg); + return drv_enter_vt_flags(pScrn, 0); +} + static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL) { -- 2.30.2