From: Eric Anholt <eric@anholt.net>
Date: Tue, 18 Dec 2007 22:17:27 +0000 (-0800)
Subject: [915] Free dri_bufmgr after mesa context data.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4878f12189c52e1cafe9240183d0e371a1f287d3;p=mesa.git

[915] Free dri_bufmgr after mesa context data.

Fixes a crash when buffer objects are left around until context destroy.
---

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index be084903c24..5d34642a5dc 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -591,8 +591,6 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
 	 intel->first_swap_fence = NULL;
       }
 
-      dri_bufmgr_destroy(intel->bufmgr);
-
       if (release_texture_heaps) {
          /* This share group is about to go away, free our private
           * texture object data.
@@ -603,6 +601,8 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
 
       /* free the Mesa context */
       _mesa_free_context_data(&intel->ctx);
+
+      dri_bufmgr_destroy(intel->bufmgr);
    }
 }