nouveau: handle early initialization errors

handle very early errors in pipe_screen creation (failure of
nouveau_screen_init in nv50_screen_create)

Signed-off-by: Francisco Jerez <currojerez@riseup.net>

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index 513e5e02bc05ab834b0f0c48d05532d978b752b0..ebb21a6e5a37d53b5c817c86cb24f38001453e12 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -258,6 +258,7 @@ nouveau_screen_fini(struct nouveau_screen *screen)
 {
        struct pipe_winsys *ws = screen->base.winsys;
        nouveau_channel_free(&screen->channel);
-       ws->destroy(ws);
+       if (ws)
+               ws->destroy(ws);
 }
 

diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index 660dbd0c332e99244088bc2b1e596a847740bd6c..d4bf124ce6f2c28ae43831098b2298734cdb0d48 100644 (file)
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
@@ -19,7 +19,8 @@ nouveau_drm_destroy_winsys(struct pipe_winsys *s)
 {
        struct nouveau_winsys *nv_winsys = nouveau_winsys(s);
        struct nouveau_screen *nv_screen= nouveau_screen(nv_winsys->pscreen);
-       nouveau_device_close(&nv_screen->device);
+       if (nv_screen)
+               nouveau_device_close(&nv_screen->device);
        FREE(nv_winsys);
 }