From f653c8b95aeda5503999477231a3c42d1da47d4b Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 15 Jul 2014 19:36:11 +0100 Subject: Fix CloseScreen bug in src/common_drm.c Fix another server segfault when shutting down due to incorrect shutdown ordering. Signed-off-by: Russell King --- src/common_drm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common_drm.c b/src/common_drm.c index 0771b49..4ab4968 100644 --- a/src/common_drm.c +++ b/src/common_drm.c @@ -918,9 +918,6 @@ Bool common_drm_PreScreenInit(ScreenPtr pScreen) xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); - drm->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = common_drm_CloseScreen; - return TRUE; } @@ -971,6 +968,9 @@ Bool common_drm_PostScreenInit(ScreenPtr pScreen) drm->hw_cursor = FALSE; } + drm->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = common_drm_CloseScreen; + if (!xf86CrtcScreenInit(pScreen)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[drm] failed to initialize screen\n"); -- cgit v1.2.3