xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 src/radeon_dri2.c |    6 ++++++
 src/radeon_kms.c  |    2 ++
 2 files changed, 8 insertions(+)

New commits:
commit cdc985e9190ce54dc6274ebc0e87ab954b15bb0d
Author: Dave Airlie <airlied at gmail.com>
Date:   Tue Sep 4 18:18:50 2012 +1000

    radeon: fix build against older servers
    
    Another silly one.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 81cb5ba..e953082 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -289,7 +289,9 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
 	radeon_glamor_flush(pScrn);
 
     radeon_cs_flush_indirect(pScrn);
+#ifdef RADEON_PIXMAP_SHARING
     radeon_dirty_update(pScreen);
+#endif
 }
 
 static void
commit bd0e9c51407cb99f1fe4f0acfedc37ee0c354040
Author: Dave Airlie <airlied at gmail.com>
Date:   Tue Sep 4 18:17:06 2012 +1000

    radeon/dri2: fix build against older servers.
    
    Older servers won't have DRI2UpdatePrime, so fix build.
    
    bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54433
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index f6f5fd5..02fe66d 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -63,6 +63,10 @@
 #define USE_DRI2_SCHEDULING
 #endif
 
+#if DRI2INFOREC_VERSION >= 9
+#define USE_DRI2_PRIME
+#endif
+
 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,6,99,0, 0)
 typedef DRI2BufferPtr BufferPtr;
 #else
@@ -578,6 +582,7 @@ radeon_dri2_copy_region2(ScreenPtr pScreen,
         src_drawable = drawable;
     }
     if (dst_private->attachment == DRI2BufferFrontLeft) {
+#ifdef USE_DRI2_PRIME
 	if (drawable->pScreen != pScreen) {
 	    dst_drawable = DRI2UpdatePrime(drawable, dest_buffer);
 	    if (!dst_drawable)
@@ -586,6 +591,7 @@ radeon_dri2_copy_region2(ScreenPtr pScreen,
 	    if (dst_drawable != drawable)
 		translate = TRUE;
 	} else
+#endif
 	    dst_drawable = drawable;
     }