xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_dri2.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit de427fac6912a625f7e4d8b982a1f7a1ba80dfbe
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jul 2 15:41:43 2009 +1000

    radeon/dri2: fix dri2 - needs newest libdrm_radeon

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 133859f..f43490e 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -97,7 +97,9 @@ radeon_dri2_create_buffers(DrawablePtr drawable,
             depth_pixmap = pixmap;
         }
         driver_priv = exaGetPixmapDriverPrivate(pixmap);
-	buffers[i].name = radeon_gem_name_bo(driver_priv->bo);
+	r = radeon_gem_get_kernel_name(driver_priv->bo, &buffers[i].name);
+	if (r)
+		return r;
 
         buffers[i].attachment = attachments[i];
         buffers[i].pitch = pixmap->devKind;
@@ -156,7 +158,10 @@ radeon_dri2_create_buffer(DrawablePtr drawable,
         depth_pixmap = pixmap;
     }
     driver_priv = exaGetPixmapDriverPrivate(pixmap);
-    buffers->name = radeon_gem_name_bo(driver_priv->bo);
+    r = radeon_gem_get_kernel_name(driver_priv->bo, &buffers->name);
+    if (r)
+	    return NULL;
+
     buffers->attachment = attachment;
     buffers->pitch = pixmap->devKind;
     buffers->cpp = pixmap->drawable.bitsPerPixel / 8;