From 19229fcf3a6eaf5e64b10b43aa5e8619444791b4 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 6 Mar 2009 13:52:19 +0100 Subject: Fix nouveau_pipe_create() / nouveau_context_init(): raise an error if the screen/pipe creation failed --- src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c') diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c index b6199f8e6d..52c3b02247 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c @@ -133,8 +133,13 @@ nouveau_pipe_create(struct nouveau_context *nv) ws = nouveau_create_pipe_winsys(nv); - if (!nvc->pscreen) + if (!nvc->pscreen) { nvc->pscreen = hws_create(ws, nvws); + if (!nvc->pscreen) { + NOUVEAU_ERR("Couldn't create hw screen\n"); + return NULL; + } + } nvc->pctx[nv->pctx_id] = hw_create(nvc->pscreen, nv->pctx_id); return nvc->pctx[nv->pctx_id]; } -- cgit v1.2.3