OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da693b7
)
i915: avoid dead lock in intel_meta_draw_poly. fix #13696
author
Xiang, Haihao
<haihao.xiang@intel.com>
Thu, 20 Dec 2007 08:49:25 +0000
(16:49 +0800)
committer
Xiang, Haihao
<haihao.xiang@intel.com>
Thu, 20 Dec 2007 08:49:25 +0000
(16:49 +0800)
src/mesa/drivers/dri/i915/intel_tris.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/i915/intel_tris.c
b/src/mesa/drivers/dri/i915/intel_tris.c
index
4b45dc0
..
474113c
100644
(file)
--- a/
src/mesa/drivers/dri/i915/intel_tris.c
+++ b/
src/mesa/drivers/dri/i915/intel_tris.c
@@
-1074,8
+1074,10
@@
intel_meta_draw_poly(struct intel_context *intel,
{
union fi *vb;
GLint i;
+ GLboolean was_locked = intel->locked;
- LOCK_HARDWARE(intel);
+ if (!was_locked)
+ LOCK_HARDWARE(intel);
/* All 3d primitives should be emitted with INTEL_BATCH_CLIPRECTS,
* otherwise the drawing origin (DR4) might not be set correctly.
@@
-1094,7
+1096,9
@@
intel_meta_draw_poly(struct intel_context *intel,
}
INTEL_FIREVERTICES(intel);
- UNLOCK_HARDWARE(intel);
+
+ if (!was_locked)
+ UNLOCK_HARDWARE(intel);
}
void