summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-08-07 21:13:12 +0100
committerMartin Peres <martin.peres@linux.intel.com>2015-09-30 10:52:30 +0300
commit70e91d61fde239e8ae58148cacd4ff891126e2aa (patch)
tree6b8579f147ebdc1bb5c26ba41aba528f3a57a45b
parente21bb9e7bdea0f73809759d3c248048eedd79663 (diff)
downloadexternal_mesa3d-70e91d61fde239e8ae58148cacd4ff891126e2aa.zip
external_mesa3d-70e91d61fde239e8ae58148cacd4ff891126e2aa.tar.gz
external_mesa3d-70e91d61fde239e8ae58148cacd4ff891126e2aa.tar.bz2
i965: Remove early release of DRI2 miptree
intel_update_winsys_renderbuffer_miptree() will release the existing miptree when wrapping a new DRI2 buffer, so we can remove the early release and so prevent a NULL mt dereference should importing the new DRI2 name fail for any reason. (Reusing the old DRI2 name will result in the rendering going astray, to a stale buffer, and not shown on the screen, but it allows us to issue a warning and not crash much later in innocent code.) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86281 Reviewed-by: Martin Peres <martin.peres@linux.intel.com> Reviewed-by: Chad Versace <chad.versace@intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 9dcdaf5..4d49929 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -1436,7 +1436,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
buffer->cpp, buffer->pitch);
}
- intel_miptree_release(&rb->mt);
bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
buffer->name);
if (!bo) {