xf86-video-ati: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu May 10 09:05:00 PDT 2012
src/radeon_kms.c | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit faea3aafa8c9a7c1bc866ffcd847972c5569c8bc
Author: Anisse Astier <anisse at astier.eu>
Date: Thu May 10 17:22:59 2012 +0200
Fail more gracefully when drm surface manager can't be initialized
Should make bugs like https://bugs.freedesktop.org/show_bug.cgi?id=48138
easier to diagnose.
[ Michel Dänzer: Appended newline to error message. ]
Signed-off-by: Anisse Astier <anisse at astier.eu>
Singed-off-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index edc8fe3..ae4953e 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1256,6 +1256,11 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
screen_size = RADEON_ALIGN(pScrn->virtualY, drmmode_get_height_align(pScrn, tiling_flags)) * pitch;
base_align = drmmode_get_base_align(pScrn, cpp, tiling_flags);
if (info->ChipFamily >= CHIP_FAMILY_R600) {
+ if(!info->surf_man) {
+ xf86DrvMsg(pScreen->myNum, X_ERROR,
+ "failed to initialise surface manager\n");
+ return FALSE;
+ }
memset(&surface, 0, sizeof(struct radeon_surface));
surface.npix_x = pScrn->displayWidth;
surface.npix_y = pScrn->virtualY;
More information about the xorg-commit
mailing list