From 0b53ca0cca9381ad63a34753a3f678397ca56aac Mon Sep 17 00:00:00 2001
From: Duncan Hopkins <duncan.hopkins@foundry.com>
Date: Fri, 6 Nov 2020 08:02:21 +0000
Subject: [PATCH] zink: return fail if create_instance fails

If create_instance() fails, returns to MESA as failed instead of contining in an bad state.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7471>
---
 src/gallium/drivers/zink/zink_screen.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 75f7698c1bd..a310de78b59 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -940,6 +940,9 @@ zink_internal_create_screen(struct sw_winsys *winsys, int fd, const struct pipe_
    zink_debug = debug_get_option_zink_debug();
 
    screen->instance = create_instance(screen);
+   if(!screen->instance)
+      goto fail;
+
    screen->pdev = choose_pdev(screen->instance);
    update_queue_props(screen);