From bf4a4d61a009d4fd8cc281ac1d4c9d6ad054703f Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@chromium.org>
Date: Thu, 12 Nov 2020 12:39:28 -0800
Subject: [PATCH] freedreno/ir3: Fix crash in shader compile fail path

Fixes: 74140c2e859 ("freedreno/ir3: convert over to ralloc")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7612>
(cherry picked from commit 4b65c09d86d37efa34e93b17b0e4a03546f26af9)
---
 .pick_status.json       | 2 +-
 src/freedreno/ir3/ir3.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 07cd5605a78..c2dfcfd45b8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2299,7 +2299,7 @@
         "description": "freedreno/ir3: Fix crash in shader compile fail path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "74140c2e859c15593a379cbde96b1048f2ad69dc"
     },
diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index 124b41f9a3a..025a75d0327 100644
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -986,7 +986,7 @@ void * ir3_assemble(struct ir3_shader_variant *v)
 	return ptr;
 
 fail:
-	free(ptr);
+	ralloc_free(ptr);
 	return NULL;
 }