Commit 1a489142 authored by Chris Wilson's avatar Chris Wilson

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: 's avatarStephen Liang <inteldriver@angrywalls.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55260Signed-off-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
parent d87c2756
......@@ -639,6 +639,12 @@ sna_uevent_init(ScrnInfoPtr scrn)
DBG(("%s\n", __FUNCTION__));
/* RandR will be disabled if Xinerama is active, and so generating
* RR hotplug events is then verboten.
*/
if (!dixPrivateKeyRegistered(rrPrivKey))
return;
if (!xf86GetOptValBool(sna->Options, OPTION_HOTPLUG, &hotplug))
from = X_DEFAULT, hotplug = TRUE;
xf86DrvMsg(scrn->scrnIndex, from, "hotplug detection: \"%s\"\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment