libdrm_intel: fix merge error

don't take the lock twice
2008-11-19 10:56:48 -08:00 · 2008-11-19 10:56:48 -08:00 · 60c1e3a09e
parent 8f5d8ba97e
commit 60c1e3a09e
1 changed files with 0 additions and 2 deletions
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@ -809,8 +809,6 @@ drm_intel_gem_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,

    pthread_mutex_lock(&bufmgr_gem->lock);

-    pthread_mutex_lock(&bufmgr_gem->lock);
-
    /* Create a new relocation list if needed */
    if (bo_gem->relocs == NULL)
 	drm_intel_setup_reloc_list(bo);