2015-09-30 15:48:33 +02:00
|
|
|
From 70e91d61fde239e8ae58148cacd4ff891126e2aa Mon Sep 17 00:00:00 2001
|
2015-09-14 16:56:32 +02:00
|
|
|
From: Chris Wilson <chris@chris-wilson.co.uk>
|
2015-09-30 15:48:33 +02:00
|
|
|
Date: Fri, 7 Aug 2015 21:13:12 +0100
|
2015-09-14 16:56:32 +02:00
|
|
|
Subject: i965: Remove early release of DRI2 miptree
|
|
|
|
|
References: bfo#86281 bko#349519
|
|
|
|
|
|
|
|
|
|
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>
|
2015-09-30 15:48:33 +02:00
|
|
|
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>
|
2015-09-14 16:56:32 +02:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
src/mesa/drivers/dri/i965/brw_context.c | 1 -
|
|
|
|
|
1 file changed, 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/src/mesa/drivers/dri/i965/brw_context.c
|
|
|
|
|
+++ b/src/mesa/drivers/dri/i965/brw_context.c
|
2015-09-30 15:48:33 +02:00
|
|
|
@@ -1412,7 +1412,6 @@ intel_process_dri2_buffer(struct brw_con
|
2015-09-14 16:56:32 +02:00
|
|
|
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) {
|
