From b451c98c4fb52fabd46dc181bddb67a415634d7c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 23 Oct 2012 23:43:50 +0100 Subject: [PATCH] sna: Disable RandR hotplug events if Xinerama is enabled Since RandR itself is disabled if Xinerama is enabled, for example with ZaphodHeads, calling RRGetInfo() upon a hotplug event generates an assertion. Reported-by: Stephen Liang Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55260 Signed-off-by: Chris Wilson --- src/sna/sna_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 4a3bd04..0acd93b 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -51,6 +51,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include "compiler.h" #include "sna.h" @@ -639,6 +640,11 @@ sna_uevent_init(ScrnInfoPtr scrn) DBG(("%s\n", __FUNCTION__)); +#ifdef PANORAMIX + if (!noPanoramiXExtension) + return; +#endif + if (!xf86GetOptValBool(sna->Options, OPTION_HOTPLUG, &hotplug)) from = X_DEFAULT, hotplug = TRUE; xf86DrvMsg(scrn->scrnIndex, from, "hotplug detection: \"%s\"\n", -- 1.7.10.4