xf86-video-ati: Branch 'master'

[Michel Dänzer]

Rebased ref, commits from common ancestor:
commit f68d9b5ba0c91a725b5eec9386c61bea8824c299
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Mar 18 18:29:27 2015 +0900

    dri3: Use screen->CreatePixmap instead of fbCreatePixmap directly
    
    Fixes crash with EXA reported by "marvin24" on IRC.

diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c
index ea0f28b..993c7a7 100644
--- a/src/radeon_dri3.c
+++ b/src/radeon_dri3.c
@@ -108,11 +108,12 @@ static PixmapPtr radeon_dri3_pixmap_from_fd(ScreenPtr screen,
 		return NULL;
 	}
 
-	pixmap = fbCreatePixmap(screen, 0, 0, depth, 0);
+	pixmap = screen->CreatePixmap(screen, 0, 0, depth, 0);
 	if (!pixmap)
 		return NULL;
 
-	if (!screen->ModifyPixmapHeader(pixmap, width, height, 0, 0, stride, NULL))
+	if (!screen->ModifyPixmapHeader(pixmap, width, height, 0, bpp, stride,
+					NULL))
 		goto free_pixmap;
 
 	if (screen->SetSharedPixmapBacking(pixmap, (void*)(intptr_t)fd))