From 261d086265fff6c9b28a67d2fcceed8f107d5cb0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 1 Jun 2012 23:22:31 +0100 Subject: legacy/i810/dri: Propagate failure from allocating texture memory Reported-by: Zdenek Kabelac Signed-off-by: Chris Wilson --- src/legacy/i810/i810_dri.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/legacy/i810/i810_dri.c b/src/legacy/i810/i810_dri.c index 2b3f1e19..28a3b919 100644 --- a/src/legacy/i810/i810_dri.c +++ b/src/legacy/i810/i810_dri.c @@ -809,7 +809,12 @@ I810DRIScreenInit(ScreenPtr pScreen) return FALSE; } - I810AllocLow(&(pI810->TexMem), &(pI810->SysMem), pI810DRI->textureSize); + if (!I810AllocLow(&(pI810->TexMem), &(pI810->SysMem), pI810DRI->textureSize)) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "[agp] Texure memory allocation failed\n"); + DRICloseScreen(pScreen); + return FALSE; + } if (drmAddMap(pI810->drmSubFD, (drm_handle_t) pI810->TexMem.Start, pI810->TexMem.Size, DRM_AGP, 0, -- cgit v1.2.1