From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Mon, 20 Jan 2020 21:01:53 +0000 (-0500)
Subject: panfrost: Fix crash in compute variant allocation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4936120230f07b959ec902aca989fdeae4e80d55;p=mesa.git

panfrost: Fix crash in compute variant allocation

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Fixes: d8a3501f1b2 ("panfrost: Dynamically allocate shader variants")
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3515>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3515>
---

diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c
index 905e6e234e0..9e3306b673f 100644
--- a/src/gallium/drivers/panfrost/pan_compute.c
+++ b/src/gallium/drivers/panfrost/pan_compute.c
@@ -46,7 +46,8 @@ panfrost_create_compute_state(
         so->cbase = *cso;
         so->is_compute = true;
 
-        struct panfrost_shader_state *v = &so->variants[0];
+        struct panfrost_shader_state *v = calloc(1, sizeof(*v));
+        so->variants = v;
 
         so->variant_count = 1;
         so->active_variant = 0;