From: Eric Anholt <eric@anholt.net>
Date: Thu, 26 Jun 2008 22:34:27 +0000 (-0700)
Subject: intel: Fix locking when doing intel_region_cow().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f059a3302260075e9cfd35649dc3877726291d8d;p=mesa.git

intel: Fix locking when doing intel_region_cow().

This was broken in the merge of 965 blit support.  It tried to lock only
when things were already locked.
---

diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index ddeffc8ae46..5d23c725047 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -377,7 +377,7 @@ intel_region_cow(struct intel_context *intel, struct intel_region *region)
     */
 
    was_locked = intel->locked;
-   if (intel->locked)
+   if (!was_locked)
       LOCK_HARDWARE(intel);
 
    intelEmitCopyBlit(intel,
@@ -388,7 +388,7 @@ intel_region_cow(struct intel_context *intel, struct intel_region *region)
 		     region->pitch, region->height,
 		     GL_COPY);
 
-   if (was_locked)
+   if (!was_locked)
       UNLOCK_HARDWARE(intel);
 }