diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-11-19 10:56:48 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-11-19 10:56:48 -0800 |
| commit | 60c1e3a09e33bfaec893c1d4780553b9b344293a (patch) | |
| tree | 1fa18e0b4621a56f9ed415b19059b235852505c0 /libdrm/intel | |
| parent | 8f5d8ba97e82072b2403bff0bf836a09640108a6 (diff) | |
libdrm_intel: fix merge error
don't take the lock twice
Diffstat (limited to 'libdrm/intel')
| -rw-r--r-- | libdrm/intel/intel_bufmgr_gem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c index 8b8cda62..64d32d38 100644 --- 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); |