From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 20 Dec 2007 08:49:25 +0000 (+0800)
Subject: i915: avoid dead lock in intel_meta_draw_poly. fix #13696
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e54329233522591bbe8aad8a3fd6bcdc1e430f03;p=mesa.git

i915: avoid dead lock in intel_meta_draw_poly. fix #13696
---

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 4b45dc065c6..474113cd632 100644
--- 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