Attachment 59408 Details for Bug 48138 – Fail more verbosely and gracefully

[patch] Fail more verbosely and gracefully

fdo48138.diff (text/plain), 1.91 KB, created by Michel Dänzer on 2012-04-03 00:40:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2012-04-03 00:40:56 UTC

Size: 1.91 KB

patch

obsolete

>diff --git a/src/radeon_kms.c b/src/radeon_kms.c
>index c094bea..2604a5b 100644
>--- a/src/radeon_kms.c
>+++ b/src/radeon_kms.c
>@@ -975,7 +975,10 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen,
>     radeon_cs_set_limit(info->cs, RADEON_GEM_DOMAIN_GTT, info->gart_size);
>     radeon_cs_space_set_flush(info->cs, (void(*)(void *))radeon_cs_flush_indirect, pScrn); 
> 
>-    radeon_setup_kernel_mem(pScreen);
>+    if (!radeon_setup_kernel_mem(pScreen)) {
>+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "radeon_setup_kernel_mem failed\n");
>+	return FALSE;
>+    }
>     front_ptr = info->front_bo->ptr;
> 
>     if (info->r600_shadow_fb) {
>@@ -1233,8 +1236,10 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
>     }
>     if (info->r600_shadow_fb == FALSE) {
>         info->accel_state->exa = exaDriverAlloc();
>-        if (info->accel_state->exa == NULL)
>+        if (info->accel_state->exa == NULL) {
>+	    xf86DrvMsg(pScreen->myNum, X_ERROR, "exaDriverAlloc failed\n");
> 	    return FALSE;
>+	}
>     }
> 
>     if (info->allowColorTiling) {
>@@ -1274,9 +1279,13 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
> 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
> 		}
> 		if (radeon_surface_best(info->surf_man, &surface)) {
>+			xf86DrvMsg(pScreen->myNum, X_ERROR,
>+				   "radeon_surface_best failed\n");
> 			return FALSE;
> 		}
> 		if (radeon_surface_init(info->surf_man, &surface)) {
>+			xf86DrvMsg(pScreen->myNum, X_ERROR,
>+				   "radeon_surface_init failed\n");
> 			return FALSE;
> 		}
> 		pitch = surface.level[0].pitch_bytes;
>@@ -1311,6 +1320,7 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
>                                                     cursor_size, 0,
>                                                     RADEON_GEM_DOMAIN_VRAM, 0);
>                 if (!info->cursor_bo[c]) {
>+                    ErrorF("Failed to allocate cursor buffer memory\n");
>                     return FALSE;
>                 }
>

Actions: View | Splinter Review

Attachments on bug 48138: 59322 | 59352 | 59408 | 59625 | 60040 | 60066 | 61025

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.