mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-26 01:59:57 +00:00
modesetting: Don't call into RandR if xinerama is enabled.
RandR doesn't initialize alongside Xinerama. This fixes a segfault with tearing down the modesetting driver while xinerama is in use. Signed-off-by: stefan11111 <stefan11111github@gmail.com>
This commit is contained in:
parent
8a11713a3c
commit
71caac0803
1 changed files with 7 additions and 1 deletions
|
|
@ -41,6 +41,7 @@
|
||||||
#include "os/mathx_priv.h"
|
#include "os/mathx_priv.h"
|
||||||
#include "Xext/present/present_priv.h"
|
#include "Xext/present/present_priv.h"
|
||||||
|
|
||||||
|
#include "extinit.h"
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include "xf86str.h"
|
#include "xf86str.h"
|
||||||
#include "X11/Xatom.h"
|
#include "X11/Xatom.h"
|
||||||
|
|
@ -4605,7 +4606,12 @@ out_free_res:
|
||||||
|
|
||||||
drmModeFreeResources(mode_res);
|
drmModeFreeResources(mode_res);
|
||||||
out:
|
out:
|
||||||
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
|
#ifdef XINERAMA
|
||||||
|
if (noPanoramiXExtension)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef DRM_MODE_LINK_STATUS_BAD
|
#undef DRM_MODE_LINK_STATUS_BAD
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue