xf86-video-intel: src/sna/sna_driver.c

[Chris Wilson]

 src/sna/sna_driver.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 53574e4f4ffe97f69c31ee74adceb81c8442c365
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 18 15:28:09 2013 +0100

    sna: Wrap use of dixPrivateKeyRegistered for uevents
    
    SLED11 also requires us to poke around in the privates as it does not
    provide the more recent privates API.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index dcfcd67..288fcf1 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -744,8 +744,13 @@ sna_uevent_init(ScrnInfoPtr scrn)
 	/* RandR will be disabled if Xinerama is active, and so generating
 	 * RR hotplug events is then verboten.
 	 */
+#if HAS_DIXREGISTERPRIVATEKEY
 	if (!dixPrivateKeyRegistered(rrPrivKey))
 		return;
+#else
+	if (rrPrivKey == 0)
+		return;
+#endif
 
 	if (!xf86GetOptValBool(sna->Options, OPTION_HOTPLUG, &hotplug))
 		from = X_DEFAULT, hotplug = TRUE;