xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_video.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5dc5012320536f7b1e86a81ed3b823e3626828e1
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jun 25 09:23:04 2012 +0100

    radeon: dixPrivateKeyRegistered is only in server 1.9
    
    just fallback to the old behaviour on older servers.
    
    should fix: https://bugs.freedesktop.org/show_bug.cgi?id=51388
    Review-over-irc: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_video.c b/src/radeon_video.c
index fcca507..b7a9a55 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -179,7 +179,10 @@ radeon_pick_best_crtc(ScrnInfoPtr pScrn,
     best_coverage = 0;
 
     /* Prefer the CRTC of the primary output */
-    if (dixPrivateKeyRegistered(rrPrivKey)) {
+#ifdef HAS_DIXREGISTERPRIVATEKEY
+    if (dixPrivateKeyRegistered(rrPrivKey))
+#endif
+    {
 	primary_output = RRFirstOutput(pScrn->pScreen);
     }
     if (primary_output && primary_output->crtc)