[PATCH] Fail more gracefully when drm surface manager can't be initialized

Anisse Astier anisse at astier.eu
Thu May 10 07:56:37 PDT 2012


Should make bugs like https://bugs.freedesktop.org/show_bug.cgi?id=48138
easier to diagnose.

Signed-off-by: Anisse Astier <anisse at astier.eu>
---
 src/radeon_kms.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index edc8fe3..d2089d1 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -947,6 +947,11 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen,
     front_ptr = info->FB;
 
     info->surf_man = radeon_surface_manager_new(info->dri->drmFD);
+    if(!info->surf_man) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		   "failed to initialise surface manager");
+        return FALSE;
+    }
     if (!info->bufmgr)
         info->bufmgr = radeon_bo_manager_gem_ctor(info->dri->drmFD);
     if (!info->bufmgr) {
-- 
1.7.9



More information about the xorg-driver-ati mailing list