When using Xinerama, RandR is automatically disabled, and calling RR
routines will trigger an assert() because the RR keys/resources are
not set, leading to an Xserver abort.
Hotplug makes little sense without RandR, so no need to install a
udev monitor if RandR is not available, as done in sna.
Signed-off-by: Olivier Fourdan <ofourdan@xxxxxxxxxx>
---
v2: Do not register udev monitor without RandR as done in sna.
src/uxa/intel_driver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 6e64b8c..7cd770f 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -775,6 +775,12 @@ I830UeventInit(ScrnInfoPtr scrn)
Bool hotplug;
MessageType from = X_CONFIG;
+#ifdef HAS_DIXREGISTERPRIVATEKEY
+ /* Without RR, nothing we can do here */
+ if (!dixPrivateKeyRegistered(rrPrivKey))
+ return;
+#endif
+
if (!xf86GetOptValBool(intel->Options, OPTION_HOTPLUG, &hotplug)) {
from = X_DEFAULT;
hotplug = TRUE;
--
2.3.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
