summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2014-07-15 19:36:11 +0100
committerRussell King <rmk@arm.linux.org.uk>2014-07-15 19:40:33 +0100
commitf653c8b95aeda5503999477231a3c42d1da47d4b (patch)
tree422cc221147440e28ed2b48d23247fb1c0e159c9
parent64c6e689dfb6a90ab86989573f6120b94f991ed5 (diff)
downloadxf86-video-armada-f653c8b95aeda5503999477231a3c42d1da47d4b.tar.gz
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 <rmk@arm.linux.org.uk>
-rw-r--r--src/common_drm.c6
1 files 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");